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

am b3dbf9b0: am 02acec79: Merge "emulator:opengl: fix windows build"

Browse Source 
* commit 'b3dbf9b05db277d5cef44c1fd319c493c4f08eba':
  emulator:opengl: fix windows build
This commit is contained in:
David Turner
2011-07-14 14:45:28 -07:00
committed by Android Git Automerger
parent 6e83704102 b3dbf9b05d
commit d6d5ed989e
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/emulator/opengl/tests/event_injector/iolooper-select.c
View File

@@ -16,6 +16,7 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include "iolooper.h" #include "iolooper.h"
#include "sockets.h"
/* An implementation of iolooper.h based on Unix select() */ /* An implementation of iolooper.h based on Unix select() */
#ifdef _WIN32 #ifdef _WIN32
@@ -238,9 +239,25 @@ iolooper_has_operations( IoLooper* iol )
int64_t int64_t
iolooper_now(void) iolooper_now(void)
{ {
#ifdef _WIN32
FILETIME now;
int64_t now_100ns;
GetSystemTimeAsFileTime(&now);
/* Get the time as hundreds of nanosecond intervals since
12:00 AM January 1t 1601 UTC. We don't really need
to compute the value relative to the Posix epoch */
now_100ns = ((int64_t)now.dwHighDateTime << 32) | now.dwLowDateTime;
/* 100 ns == 0.1 us == 0.0001 ms */
return now_100ns / 10000LL;
#else /* !_WIN32 */
struct timeval time_now; struct timeval time_now;
return gettimeofday(&time_now, NULL) ? -1 : (int64_t)time_now.tv_sec * 1000LL + return gettimeofday(&time_now, NULL) ? -1 : (int64_t)time_now.tv_sec * 1000LL +
time_now.tv_usec / 1000; time_now.tv_usec / 1000;
#endif /* !_WIN32 */
} }
int int