From 8786dd626e2356919f8ef048a7698b4492c822da Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 16 Aug 2016 13:37:31 -0500 Subject: [PATCH] FS-9362: [mod_sofia] fix sofia compile error on newer clang included in new osx Conflicts: libs/sofia-sip/.update --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/su/su_time.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 0ef1bfcdf6..eb6dc88486 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Mon Aug 8 16:39:35 CDT 2016 +Tue Aug 16 13:39:03 CDT 2016 diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_time.c b/libs/sofia-sip/libsofia-sip-ua/su/su_time.c index 2326bfaba8..2782dcec77 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_time.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_time.c @@ -398,7 +398,7 @@ uint64_t su_nanocounter(void) static int init = 0; static clockid_t cpu = CLOCK_REALTIME; -# define CLOCK_GETTIMEOFDAY 0xdedbeefUL +# define CLOCK_GETTIMEOFDAY ((clockid_t)-1) if (init == 0) { init = 1;