From 0375f9023e0bcb51b7d70c6d21e656828151c99e Mon Sep 17 00:00:00 2001 From: sletz Date: Wed, 3 Sep 2008 10:33:59 +0000 Subject: [PATCH] Revert some changes incorrecly commited at rev 2860 on JackThread and JackPosixThread classes. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2864 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackPosixThread.cpp | 12 ++++-------- common/JackThread.h | 9 --------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/common/JackPosixThread.cpp b/common/JackPosixThread.cpp index 2070af46..0427b059 100644 --- a/common/JackPosixThread.cpp +++ b/common/JackPosixThread.cpp @@ -263,8 +263,7 @@ void JackPosixThread::Terminate() } // end of namespace -//EXPORT bool jack_tls_allocate_key(jack_tls_key *key_ptr) -bool jack_tls_allocate_key(jack_tls_key *key_ptr) +EXPORT bool jack_tls_allocate_key(jack_tls_key *key_ptr) { int ret; @@ -278,8 +277,7 @@ bool jack_tls_allocate_key(jack_tls_key *key_ptr) return true; } -//EXPORT bool jack_tls_free_key(jack_tls_key key) -bool jack_tls_free_key(jack_tls_key key) +EXPORT bool jack_tls_free_key(jack_tls_key key) { int ret; @@ -293,8 +291,7 @@ bool jack_tls_free_key(jack_tls_key key) return true; } -//EXPORT bool jack_tls_set(jack_tls_key key, void *data_ptr) -bool jack_tls_set(jack_tls_key key, void *data_ptr) +EXPORT bool jack_tls_set(jack_tls_key key, void *data_ptr) { int ret; @@ -308,8 +305,7 @@ bool jack_tls_set(jack_tls_key key, void *data_ptr) return true; } -//EXPORT void *jack_tls_get(jack_tls_key key) -void *jack_tls_get(jack_tls_key key) +EXPORT void *jack_tls_get(jack_tls_key key) { return pthread_getspecific(key); } diff --git a/common/JackThread.h b/common/JackThread.h index 03089b41..2ded4825 100644 --- a/common/JackThread.h +++ b/common/JackThread.h @@ -110,19 +110,10 @@ typedef DWORD jack_tls_key; typedef pthread_key_t jack_tls_key; #endif -/* EXPORT bool jack_tls_allocate_key(jack_tls_key *key_ptr); EXPORT bool jack_tls_free_key(jack_tls_key key); EXPORT bool jack_tls_set(jack_tls_key key, void *data_ptr); EXPORT void *jack_tls_get(jack_tls_key key); -*/ - -bool jack_tls_allocate_key(jack_tls_key *key_ptr); -bool jack_tls_free_key(jack_tls_key key); - -bool jack_tls_set(jack_tls_key key, void *data_ptr); -void *jack_tls_get(jack_tls_key key); - #endif