[asterisk-commits] mvanbaak: branch 1.6.1 r216508 - in /branches/1.6.1: ./ main/utils.c

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Fri Sep  4 10:09:35 2009
New Revision: 216508

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

................
  r216506 | mvanbaak | 2009-09-04 17:05:05 +0200 (Fri, 04 Sep 2009) | 9 lines
  
  Merged revisions 216435 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r216435 | mvanbaak | 2009-09-04 15:56:10 +0200 (Fri, 04 Sep 2009) | 2 lines
    
    make asterisk compile under devmode with DEBUG_THREADS enabled on OpenBSD
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/utils.c

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

Modified: branches/1.6.1/main/utils.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/utils.c?view=diff&rev=216508&r1=216507&r2=216508
==============================================================================
--- branches/1.6.1/main/utils.c (original)
+++ branches/1.6.1/main/utils.c Fri Sep  4 10:09:35 2009
@@ -873,7 +873,7 @@
 	AST_LIST_TRAVERSE(&lock_infos, lock_info, entry) {
 		int i;
 		if (lock_info->num_locks) {
-			ast_str_append(&str, 0, "=== Thread ID: %d (%s)\n", (int) lock_info->thread_id,
+			ast_str_append(&str, 0, "=== Thread ID: %ld (%s)\n", (long) lock_info->thread_id,
 				lock_info->thread_name);
 			pthread_mutex_lock(&lock_info->lock);
 			for (i = 0; str && i < lock_info->num_locks; i++) {