Changeset 5574 for pjproject/trunk/pjlib/src/pj/os_timestamp_posix.c

Timestamp:

Mar 29, 2017 5:07:47 AM (8 years ago)

Author:

riza

Message:

Fix #2006: Fix android build failed using NDK r14 caused by by the removal of android_alarm.h.

File:

• pjproject/trunk/pjlib/src/pj/os_timestamp_posix.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/os_timestamp_posix.c

@@ -164 +164 @@
 
 #include <errno.h>
-#include <linux/android_alarm.h>
-#include <fcntl.h>
 #include <time.h>
 
+#if defined(PJ_HAS_ANDROID_ALARM_H) && PJ_HAS_ANDROID_ALARM_H != 0
+#  include <linux/android_alarm.h>
+#  include <fcntl.h>
+#endif
+
 #define NSEC_PER_SEC    1000000000
 
+#if defined(ANDROID_ALARM_GET_TIME)
 static int s_alarm_fd = -1;
 
@@ -178 +182 @@
     s_alarm_fd = -1;
 }
+#endif
 
 PJ_DEF(pj_status_t) pj_get_timestamp(pj_timestamp *ts)
@@ -184 +189 @@
     int err = -1;
 
+#if defined(ANDROID_ALARM_GET_TIME)
     if (s_alarm_fd == -1) {
         int fd = open("/dev/alarm", O_RDONLY);
@@ -196 +202 @@
               ANDROID_ALARM_GET_TIME(ANDROID_ALARM_ELAPSED_REALTIME), &tp);
     }
+#elif defined(CLOCK_BOOTTIME)
+    err = clock_gettime(CLOCK_BOOTTIME, &tp);
+#endif
     
     if (err != 0) {
         /* Fallback to CLOCK_MONOTONIC if /dev/alarm is not found, or
-         * getting ANDROID_ALARM_ELAPSED_REALTIME fails.
+         * getting ANDROID_ALARM_ELAPSED_REALTIME fails, or 
+         * CLOCK_BOOTTIME fails.
          */
         err = clock_gettime(CLOCK_MONOTONIC, &tp);