Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move clock_gettime() into GNU.cpp

Browse Source
This commit is contained in:
Andreas Schroeder
2014-04-29 22:10:42 +02:00
parent 22a90a0907
commit ebe20a0825
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utilities/GNU.cpp
+12 -1
View File
@@ -1,3 +1,5 @@
#include <time.h>
#include <sys/time.h>
#include "GNU.h" #include "GNU.h"
#ifdef __APPLE__ #ifdef __APPLE__
@@ -6,4 +8,13 @@ void * _aligned_malloc(size_t size, size_t alignment) {
posix_memalign(&buffer, alignment, size); posix_memalign(&buffer, alignment, size);
return buffer; return buffer;
} }
#endif
int clock_gettime(int foo, struct timespec *ts) {
struct timeval tv;
gettimeofday(&tv, NULL);
ts->tv_sec = tv.tv_sec;
ts->tv_nsec = tv.tv_usec * 1000;
return(0);
}
#endif /* !__APPLE__ */
Utilities/GNU.h
+5 -14
View File
@@ -24,26 +24,17 @@
#define _aligned_malloc(size,alignment) memalign(alignment,size) #define _aligned_malloc(size,alignment) memalign(alignment,size)
#else #else
void * _aligned_malloc(size_t size, size_t alignment); void * _aligned_malloc(size_t size, size_t alignment);
int clock_gettime(int foo, struct timespec *ts);
#define wxIsNaN(x) ((x) != (x)) #define wxIsNaN(x) ((x) != (x))
#endif
#define _aligned_free free
#ifndef CLOCK_MONOTONIC #ifndef CLOCK_MONOTONIC
#define CLOCK_MONOTONIC 0 #define CLOCK_MONOTONIC 0
#include <time.h>
#include <sys/time.h>
static int clock_gettime(int foo, struct timespec *ts) {
struct timeval tv;
gettimeofday(&tv, NULL);
ts->tv_sec = tv.tv_sec;
ts->tv_nsec = tv.tv_usec * 1000;
return (0);
}
#endif /* !CLOCK_MONOTONIC */ #endif /* !CLOCK_MONOTONIC */
#endif /* !__APPLE__ */
#define _aligned_free free
#define DWORD int32_t #define DWORD int32_t
#endif #endif