am d5106417: Merge "Fix Mac sdk builds"

* commit 'd510641759d0cd769bc2bb397db001a6bd656617':
  Fix Mac sdk builds
This commit is contained in:
David 'Digit' Turner
2011-04-05 06:45:36 -07:00
committed by Android Git Automerger

View File

@@ -24,7 +24,7 @@
#include <sys/time.h>
#include <time.h>
#else
#error "Unsupported platform"
#include <time.h>
#endif
long long GetCurrentTimeMS()
@@ -47,9 +47,12 @@ long long GetCurrentTimeMS()
long long iDiff = (now.tv_sec * 1000LL) + now.tv_nsec/1000000LL;
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
}