commit 148f1a83733ad207e64a11812906a2acf6674eb1
author Elliott Hughes <enh@google.com> Fri Jan 09 23:46:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 09 23:46:05 2015 +0000
tree 81f0c3d363519445718f376edf3edc4901fa7e7a
parent 42da271205576972c21c2f75fef4f7261bcd6c4f
parent bdfdd7761d9f79c9e55a40f818781a69b01848ad

am bdfdd776: Merge "We have POSIX clocks."

* commit 'bdfdd7761d9f79c9e55a40f818781a69b01848ad':
  We have POSIX clocks.

libril/ril_event.cpp

diff --git a/libril/ril_event.cpp b/libril/ril_event.cpp
index 9d2954e..6bdf59d 100644
--- a/libril/ril_event.cpp
+++ b/libril/ril_event.cpp
@@ -95,14 +95,10 @@
 
 static void getNow(struct timeval * tv)
 {
-#ifdef HAVE_POSIX_CLOCKS
     struct timespec ts;
     clock_gettime(CLOCK_MONOTONIC, &ts);
     tv->tv_sec = ts.tv_sec;
     tv->tv_usec = ts.tv_nsec/1000;
-#else
-    gettimeofday(tv, NULL);
-#endif
 }
 
 static void init_list(struct ril_event * list)