generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed build on GNU/Hurd (ticket #761)

Browse Source
This commit is contained in:
Alexander Shishkov 2011-05-31 15:22:22 +00:00
parent dfdbf0abd0
commit eae7921da6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/src/system.cpp
View File

@ -72,7 +72,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#ifdef __MACH__ #ifdef __MACH__ && defined __APPLE__
#include <mach/mach.h> #include <mach/mach.h>
#include <mach/mach_time.h> #include <mach/mach_time.h>
#endif #endif
@ -196,7 +196,7 @@ int64 getTickCount(void)
struct timespec tp; struct timespec tp;
clock_gettime(CLOCK_MONOTONIC, &tp); clock_gettime(CLOCK_MONOTONIC, &tp);
return (int64)tp.tv_sec*1000000000 + tp.tv_nsec; return (int64)tp.tv_sec*1000000000 + tp.tv_nsec;
#elif defined __MACH__ #elif defined __MACH__ && defined __APPLE__
return (int64)mach_absolute_time(); return (int64)mach_absolute_time();
#else #else
struct timeval tv; struct timeval tv;
@ -214,7 +214,7 @@ double getTickFrequency(void)
return (double)freq.QuadPart; return (double)freq.QuadPart;
#elif defined __linux || defined __linux__ #elif defined __linux || defined __linux__
return 1e9; return 1e9;
#elif defined __MACH__ #elif defined __MACH__ && defined __APPLE__
static double freq = 0; static double freq = 0;
if( freq == 0 ) if( freq == 0 )
{ {