diff options
| author | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-04 15:11:55 +0000 |
|---|---|---|
| committer | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-04 15:11:55 +0000 |
| commit | 3268c67a568ee9cd396b4a2e0b2c86f5817a90b4 (patch) | |
| tree | 34f110e252698c1e2d7416cbf9671f3a46b729b2 | |
| parent | 0922efa1de6a1496c2ba63eac4037f60567e8a74 (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@216509 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/utils.c b/main/utils.c index c48cb12d0..00badfa88 100644 --- a/main/utils.c +++ b/main/utils.c @@ -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++) { |