Browse Source

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
tags/1.90
sletz 16 years ago
parent
commit
0375f9023e
2 changed files with 4 additions and 17 deletions
  1. +4
    -8
      common/JackPosixThread.cpp
  2. +0
    -9
      common/JackThread.h

+ 4
- 8
common/JackPosixThread.cpp View File

@@ -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);
}

+ 0
- 9
common/JackThread.h View File

@@ -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

Loading…
Cancel
Save