kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-23 16:05:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

This exception does not appear to still be true for Solaris 10, and OpenSolaris definitely needs it to be removed.

Browse Source 
Fixed for snuff-home on -dev channel.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@177701 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-02-20 21:15:01 +00:00
parent a5198f55e0
commit 426cee0362
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/asterisk/threadstorage.h
+11 -17
View File
@@ -43,12 +43,6 @@ struct ast_threadstorage {
void (*key_init)(void);
};
#ifdef SOLARIS
#define THREADSTORAGE_ONCE_INIT {PTHREAD_ONCE_INIT}
#else
#define THREADSTORAGE_ONCE_INIT PTHREAD_ONCE_INIT
#endif
#if defined(DEBUG_THREADLOCALS)
void __ast_threadstorage_object_add(void *key, size_t len, const char *file, const char *function, unsigned int line);
void __ast_threadstorage_object_remove(void *key);
@@ -77,28 +71,28 @@ void __ast_threadstorage_object_replace(void *key_old, void *key_new, size_t len
#define AST_THREADSTORAGE_CUSTOM(name, name_init, cleanup) \
static void name_init(void); \
static struct ast_threadstorage name = { \
.once = THREADSTORAGE_ONCE_INIT, \
.key_init = name_init, \
.once = PTHREAD_ONCE_INIT, \
.key_init = name_init, \
}; \
static void name_init(void) \
{ \
pthread_key_create(&(name).key, cleanup); \
pthread_key_create(&(name).key, cleanup); \
}
#else /* defined(DEBUG_THREADLOCALS) */
#define AST_THREADSTORAGE_CUSTOM(name, name_init, cleanup) \
static void name_init(void); \
static struct ast_threadstorage name = { \
.once = THREADSTORAGE_ONCE_INIT, \
.key_init = name_init, \
.once = PTHREAD_ONCE_INIT, \
.key_init = name_init, \
}; \
static void __cleanup_##name(void *data) \
{ \
__ast_threadstorage_object_remove(data); \
cleanup(data); \
} \
static void __cleanup_##name(void *data) \
{ \
__ast_threadstorage_object_remove(data); \
cleanup(data); \
} \
static void name_init(void) \
{ \
pthread_key_create(&(name).key, __cleanup_##name); \
pthread_key_create(&(name).key, __cleanup_##name); \
}
#endif /* defined(DEBUG_THREADLOCALS) */