diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-22 19:46:16 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-22 19:46:16 +0000 |
commit | 203cacc642cb20b6047909a90f70a006c3811216 (patch) | |
tree | 04405419b73fd09eda19a7dffd54a0cfcc83da58 /include | |
parent | f6078cf0c709b79117d7f049f713f0158366e820 (diff) |
Merged revisions 139554 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r139554 | mmichelson | 2008-08-22 14:45:41 -0500 (Fri, 22 Aug 2008) | 16 lines
Merged revisions 139553 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r139553 | mmichelson | 2008-08-22 14:45:19 -0500 (Fri, 22 Aug 2008) | 8 lines
Fix compilation when DEBUG_THREAD_LOCALS is selected
(closes issue #13298)
Reported by: snuffy
Patches:
bug13298_20080822.diff uploaded by snuffy (license 35)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@139555 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/threadstorage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/threadstorage.h b/include/asterisk/threadstorage.h index de4f05b43..ac44d99f2 100644 --- a/include/asterisk/threadstorage.h +++ b/include/asterisk/threadstorage.h @@ -199,7 +199,7 @@ void *__ast_threadstorage_get(struct ast_threadstorage *ts, size_t init_size, co return NULL; } pthread_setspecific(ts->key, buf); - __ast_threadstorage_object_add(ts->key, init_size, file, function, line); + __ast_threadstorage_object_add(&ts->key, init_size, file, function, line); } return buf; |