[asterisk-commits] mmichelson: branch 1.6.1 r139556 - in /branches/1.6.1: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Aug 22 14:46:33 2008
New Revision: 139556

URL: http://svn.digium.com/view/asterisk?view=rev&rev=139556
Log:
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)


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/include/asterisk/threadstorage.h

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

Modified: branches/1.6.1/include/asterisk/threadstorage.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/include/asterisk/threadstorage.h?view=diff&rev=139556&r1=139555&r2=139556
==============================================================================
--- branches/1.6.1/include/asterisk/threadstorage.h (original)
+++ branches/1.6.1/include/asterisk/threadstorage.h Fri Aug 22 14:46:33 2008
@@ -199,7 +199,7 @@
 			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;