[asterisk-commits] jpeeler: branch 1.6.0 r207157 - in /branches/1.6.0: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Jul 17 14:38:54 2009
New Revision: 207157

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

................
  r207156 | jpeeler | 2009-07-17 14:37:38 -0500 (Fri, 17 Jul 2009) | 14 lines
  
  Merged revisions 207155 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r207155 | jpeeler | 2009-07-17 14:36:19 -0500 (Fri, 17 Jul 2009) | 7 lines
    
    Fix format specifier to print out an unsigned long long.
    
    Yep, it's even ifdefed out code. But it made it to the RR list...
    
    (closes issue #14726)
    Reported by: lmadsen
  ........
................

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

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

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=207157&r1=207156&r2=207157
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Fri Jul 17 14:38:54 2009
@@ -9385,7 +9385,7 @@
 		if (roundrobin)
 			round_robin[x] = p;
 #if 0
-		ast_verbose("name = %s, %d, %d, %d\n",p->owner ? p->owner->name : "<none>", p->channel, channelmatch, groupmatch);
+		ast_verbose("name = %s, %d, %d, %llu\n",p->owner ? p->owner->name : "<none>", p->channel, channelmatch, groupmatch);
 #endif
 
 		if (p && available(p, channelmatch, groupmatch, &busy, &channelmatched, &groupmatched)) {