LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am ca7616f2: am d5106417: Merge "Fix Mac sdk builds"

Browse Source 
* commit 'ca7616f21d51faef34771351caffc3d00c2579dd':
  Fix Mac sdk builds
This commit is contained in:
David 'Digit' Turner
2011-04-05 07:35:04 -07:00
committed by Android Git Automerger
parent 5c0f4ce0be ca7616f21d
commit f0f9b1bd40
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/emulator/opengl/shared/OpenglCodecCommon/TimeUtils.cpp
View File

@@ -24,7 +24,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#else #else
#error "Unsupported platform" #include <time.h>
#endif #endif
long long GetCurrentTimeMS() long long GetCurrentTimeMS()
@@ -47,9 +47,12 @@ long long GetCurrentTimeMS()
long long iDiff = (now.tv_sec * 1000LL) + now.tv_nsec/1000000LL; long long iDiff = (now.tv_sec * 1000LL) + now.tv_nsec/1000000LL;
return iDiff; return iDiff;
#else #else /* Others, e.g. OS X */
#error "Unsupported platform" struct timeval now;
gettimeofday(&now, NULL);
long long iDiff = (now.tv_sec * 1000LL) + now.tv_usec/1000LL;
return iDiff;
#endif #endif
} }