From: Michael Jerris Date: Tue, 12 Aug 2008 17:04:38 +0000 (+0000) Subject: Thu Jul 24 13:04:33 EDT 2008 Pekka Pessi X-Git-Tag: v1.0.2~1465 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf3a921708406c13fbe7ca13bed288ce686044bd;p=thirdparty%2Ffreeswitch.git Thu Jul 24 13:04:33 EDT 2008 Pekka Pessi * su_time0.c, m4/sac-su2.m4: check for CLOCK_MONOTONIC, too git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9270 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index c255c77370..d46948d9ca 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Tue Aug 12 13:04:10 EDT 2008 +Tue Aug 12 13:04:33 EDT 2008 diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c b/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c index 5e504e33be..466bb7a4ab 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c @@ -179,7 +179,7 @@ su_nanotime_t su_nanotime(su_nanotime_t *return_time) */ su_nanotime_t su_monotime(su_nanotime_t *return_time) { -#if HAVE_CLOCK_GETTIME +#if HAVE_CLOCK_GETTIME && CLOCK_MONOTONIC { struct timespec tv; diff --git a/libs/sofia-sip/m4/sac-su2.m4 b/libs/sofia-sip/m4/sac-su2.m4 index 8927ca1428..5203293d53 100644 --- a/libs/sofia-sip/m4/sac-su2.m4 +++ b/libs/sofia-sip/m4/sac-su2.m4 @@ -442,6 +442,10 @@ AC_ARG_WITH(rt, if test "${with_rt}" != no; then AC_SEARCH_LIBS(clock_gettime, rt) AC_CHECK_FUNCS([clock_gettime clock_getcpuclockid]) + AC_CHECK_DECL([CLOCK_MONOTONIC], +AC_DEFINE([HAVE_CLOCK_MONOTONIC], 1, +[Define to 1 if you have CLOCK_MONOTONIC]),,[ +#include ]) fi # No GLib path explicitly defined, use pkg-config