commit a1f8afa930ccaa0241892f25d37325743661755a
author Narayan Kamath <narayan@google.com> Tue Apr 15 20:52:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 15 20:52:52 2014 +0000
tree 28e788897f53dadb9504777175e7184e0d0dd72e
parent e65e2134444a28199c3ede61a692457c73478f94
parent d954c6b92024fbb183ea3acb7366a39765a6e3c0

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

* commit 'd954c6b92024fbb183ea3acb7366a39765a6e3c0':
  "desktop" linux has Posix clocks.

core/combo/include/arch/linux-x86/AndroidConfig.h

diff --git a/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h
index 5761e48..79b9cef 100644
--- a/core/combo/include/arch/linux-x86/AndroidConfig.h
+++ b/core/combo/include/arch/linux-x86/AndroidConfig.h
@@ -121,11 +121,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()