[asterisk-commits] murf: branch 1.6.1 r168621 - in /branches/1.6.1: ./ apps/app_page.c

[SVN commits to the Asterisk project]

Author: murf
Date: Wed Jan 14 15:30:36 2009
New Revision: 168621

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

................
  r168613 | murf | 2009-01-14 13:51:26 -0700 (Wed, 14 Jan 2009) | 9 lines
  
  Merged revisions 168608 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r168608 | murf | 2009-01-14 12:34:35 -0700 (Wed, 14 Jan 2009) | 1 line
    
    app_page was failing to compile in dev-mode on my gcc-4.2.4 system. This change gets rid of the warning.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_page.c

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

Modified: branches/1.6.1/apps/app_page.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/apps/app_page.c?view=diff&rev=168621&r1=168620&r2=168621
==============================================================================
--- branches/1.6.1/apps/app_page.c (original)
+++ branches/1.6.1/apps/app_page.c Wed Jan 14 15:30:36 2009
@@ -116,7 +116,7 @@
 	}
 
 	if (!(dial_list = ast_calloc(num_dials, sizeof(void *)))) {
-		ast_log(LOG_ERROR, "Can't allocate %ld bytes for dial list\n", (sizeof(void *) * num_dials));
+		ast_log(LOG_ERROR, "Can't allocate %ld bytes for dial list\n", (long)(sizeof(void *) * num_dials));
 		return -1;
 	}