am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."

* commit '60b9496c016f81df8f1c4202ba8a5190543900d5':
  "desktop" linux has Posix clocks.
This commit is contained in:
Narayan Kamath 2014-04-15 11:06:26 +00:00 committed by Android Git Automerger
commit d954c6b920

View file

@ -128,11 +128,8 @@
/*
* Define this if have clock_gettime() and friends
*
* Desktop Linux has this in librt, but it's broken in goobuntu, yielding
* mildly or wildly inaccurate results.
*/
/*#define HAVE_POSIX_CLOCKS*/
#define HAVE_POSIX_CLOCKS
/*
* Define this if we have linux style epoll()