From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 17 Jul 2009 19:39:24 +0000 (+0000)
Subject: Merged revisions 207156 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=933fb5bc3f4855f4645b0990103c5b0bb5eaccd1;p=thirdparty%2Fasterisk.git

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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@207158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 1c596887c5..232d28857d 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -9579,7 +9579,7 @@ static struct ast_channel *dahdi_request(const char *type, int format, void *dat
 		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)) {