diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-20 21:15:01 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-20 21:15:01 +0000 |
| commit | 059001f427f480c87ebc8bbe213bd0f6d8f32cad (patch) | |
| tree | 9a277c7096f04ec9e03abf93223bb1c78809e549 | |
| parent | 5e2339d951823a04d755ef3d145b651751096277 (diff) | |
This exception does not appear to still be true for Solaris 10, and OpenSolaris definitely needs it to be removed.
Fixed for snuff-home on -dev channel.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@177701 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk/threadstorage.h | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/include/asterisk/threadstorage.h b/include/asterisk/threadstorage.h index 3829b8f1a..7a08723b1 100644 --- a/include/asterisk/threadstorage.h +++ b/include/asterisk/threadstorage.h @@ -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) */ |