From: Julian Seward <jseward@acm.org>
Date: Thu, 5 Sep 2002 19:47:46 +0000 (+0000)
Subject: Use definition of  enum __libc_tsd_key_t  from glibc 2.2.4 rather than
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c095542c431e526d7fee83e898886940e8b4136;p=thirdparty%2Fvalgrind.git

Use definition of  enum __libc_tsd_key_t  from glibc 2.2.4 rather than
2.2.2.  This gets rid of the following message:

valgrind's libpthread.so: libc_internal_tsd_get: dubious key 2

MERGE TO ERASER


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_1_0_BRANCH@899
---

diff --git a/vg_libpthread.c b/vg_libpthread.c
index 0ed6ee3cf6..1d1ab05adc 100644
--- a/vg_libpthread.c
+++ b/vg_libpthread.c
@@ -1388,13 +1388,14 @@ struct __res_state* __res_state ( void )
 /* Relies on assumption that initial private data is NULL.  This
    should be fixed somehow. */
 
-/* The allowable keys (indices) (all 2 of them). 
+/* The allowable keys (indices) (all 3 of them). 
    From sysdeps/pthread/bits/libc-tsd.h
 */
-#define N_LIBC_TSD_EXTRA_KEYS 1
+#define N_LIBC_TSD_EXTRA_KEYS 0
 
 enum __libc_tsd_key_t { _LIBC_TSD_KEY_MALLOC = 0,
                         _LIBC_TSD_KEY_DL_ERROR,
+                        _LIBC_TSD_KEY_RPC_VARS,
                         _LIBC_TSD_KEY_N };
 
 /* Auto-initialising subsystem.  libc_specifics_inited is set