]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 216506 via svnmerge from
authorMichiel van Baak <michiel@vanbaak.info>
Fri, 4 Sep 2009 15:09:35 +0000 (15:09 +0000)
committerMichiel van Baak <michiel@vanbaak.info>
Fri, 4 Sep 2009 15:09:35 +0000 (15:09 +0000)
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
  ........
................

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

main/utils.c

index 90742a8a033bd551262671e5c2b82c53424edf81..f40031454e07c6a880fb7a7281a8a46d32de3e03 100644 (file)
@@ -873,7 +873,7 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_
        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++) {