[svn-commits] mmichelson: branch 1.6.0 r158263 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Nov 20 19:00:24 2008
New Revision: 158263

URL: http://svn.digium.com/view/asterisk?view=rev&rev=158263
Log:
Merged revisions 158262 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r158262 | mmichelson | 2008-11-20 18:59:23 -0600 (Thu, 20 Nov 2008) | 6 lines

Fix the build for 32-bit systems. %lu is only 32-bits
on 32-bit systems, so we need to use %llu instead. Of course
%llu is 128-bits on 64-bit systems, so we have to cast to
unsigned long long. No harm, but it's sure annoying.


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=158263&r1=158262&r2=158263
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Nov 20 19:00:24 2008
@@ -6558,7 +6558,7 @@
 		ast_log(LOG_WARNING, "SDP sytax error in o= line\n");
 		return -1;
 	}
-	if (!sscanf(token, "%lu", &rua_version)) {
+	if (!sscanf(token, "%llu", (unsigned long long *) &rua_version)) {
 		ast_log(LOG_WARNING, "SDP sytax error in o= line version\n");
 		return -1;
 	}