[asterisk-commits] moy: branch 12 r409704 - in /branches/12: ./ res/res_http_websocket.c

[SVN commits to the Asterisk project]

Author: moy
Date: Tue Mar  4 22:59:21 2014
New Revision: 409704

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=409704
Log:
Fix res/res_http_websocket.c build failure in 32bit due to incorrect print format for uint64_t
........

Merged revisions 409703 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/res/res_http_websocket.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/res/res_http_websocket.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_http_websocket.c?view=diff&rev=409704&r1=409703&r2=409704
==============================================================================
--- branches/12/res/res_http_websocket.c (original)
+++ branches/12/res/res_http_websocket.c Tue Mar  4 22:59:21 2014
@@ -481,7 +481,7 @@
 		}
 
 		if (!(new_payload = ast_realloc(session->payload, (session->payload_len + *payload_len)))) {
-			ast_log(LOG_WARNING, "Failed allocation: %p, %zd, %lu\n",
+			ast_log(LOG_WARNING, "Failed allocation: %p, %zd, %"PRIu64"\n",
 				session->payload, session->payload_len, *payload_len);
 			*payload_len = 0;
 			ast_websocket_close(session, 1009);