From: Julian Seward Date: Sun, 20 Oct 2002 16:25:55 +0000 (+0000) Subject: merge rev 1.90.2.12: X-Git-Tag: svn/VALGRIND_1_9_4~205 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f7a43395a882521da7ac158e7b5ddc4e25754d9;p=thirdparty%2Fvalgrind.git merge rev 1.90.2.12: Put __pthread_getspecific_addr inside ifdefs. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1242 --- diff --git a/coregrind/arch/x86-linux/vg_libpthread.c b/coregrind/arch/x86-linux/vg_libpthread.c index 363e6ffd2c..42e289f363 100644 --- a/coregrind/arch/x86-linux/vg_libpthread.c +++ b/coregrind/arch/x86-linux/vg_libpthread.c @@ -1419,6 +1419,7 @@ void * __pthread_getspecific(pthread_key_t key) } +#ifdef GLIBC_2_3 static void ** __pthread_getspecific_addr(pthread_key_t key) { @@ -1431,7 +1432,7 @@ void ** __pthread_getspecific_addr(pthread_key_t key) specifics_ptr = get_or_allocate_specifics_ptr(pthread_self()); return &(specifics_ptr[key]); } - +#endif /* --------------------------------------------------- ONCEry diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c index 363e6ffd2c..42e289f363 100644 --- a/coregrind/vg_libpthread.c +++ b/coregrind/vg_libpthread.c @@ -1419,6 +1419,7 @@ void * __pthread_getspecific(pthread_key_t key) } +#ifdef GLIBC_2_3 static void ** __pthread_getspecific_addr(pthread_key_t key) { @@ -1431,7 +1432,7 @@ void ** __pthread_getspecific_addr(pthread_key_t key) specifics_ptr = get_or_allocate_specifics_ptr(pthread_self()); return &(specifics_ptr[key]); } - +#endif /* --------------------------------------------------- ONCEry