From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 5 Mar 2014 16:25:39 +0000 (-0600)
Subject: Port commit from gitorious copy of sofia-sip our code now differs but this issue... 
X-Git-Tag: v1.5.11~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=066de4b378cb4c571743957b85e46c6b299b86f4;p=thirdparty%2Ffreeswitch.git

Port commit from gitorious copy of sofia-sip our code now differs but this issue would still be a concern for OS X

commit ee51fa4e2993ab71339e29691aec8b924c810c53
Author: Frode Isaksen <frode.isaksen@bewan.com>
Date:   Thu Aug 18 16:40:58 2011 +0300

    su: fix su_time() on 64-bit OS X

        The field tv_sec in struct timeval is 64bits instead of 32bits as in
	    su_time_t, so you cannot cast su_time_t to struct timeval.
---

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 548e466bd2..048b1784b8 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Fri Feb 21 16:38:32 EST 2014
+Wed Mar  5 10:25:31 CST 2014
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 cae14a35a8..45b07dd1d4 100644
--- a/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c
@@ -106,10 +106,10 @@ void su_time(su_time_t *tv)
 		ltv.tv_usec = ctv.tv_nsec / 1000;
     }
 #elif HAVE_GETTIMEOFDAY
-
-    gettimeofday((struct timeval *)&ltv, NULL);
-    ltv.tv_sec += NTP_EPOCH;
-
+	struct timeval tmp_tv = {0,0};
+    gettimeofday(&tmp_tv, NULL);
+	ltv.tv_sec = tmp_tv.tv_sec + NTP_EPOCH;
+	ltv.tv_usec = (unsigned long)tmp_tv.tv_usec;
 #elif HAVE_FILETIME
 
   GetSystemTimeAsFileTime(date.ft);