From 98e763d441c2896f407813bf36a5ae1c3c4a0369 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Thu, 23 Jan 2003 08:25:15 +0000 Subject: Just be a bit less different from latest glibc version in comments and in the files where variables live. --- libpthread/linuxthreads/manager.c | 4 ---- libpthread/linuxthreads/pthread.c | 3 +++ libpthread/linuxthreads/specific.c | 3 ++- libpthread/linuxthreads_db/td_symbol_list.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libpthread') diff --git a/libpthread/linuxthreads/manager.c b/libpthread/linuxthreads/manager.c index ba4849d37..1b513ca92 100644 --- a/libpthread/linuxthreads/manager.c +++ b/libpthread/linuxthreads/manager.c @@ -56,10 +56,6 @@ struct pthread_handle_struct __pthread_handles[PTHREAD_THREADS_MAX] = /* For debugging purposes put the maximum number of threads in a variable. */ const int __linuxthreads_pthread_threads_max = PTHREAD_THREADS_MAX; -/* Put the size of the pthread_descr in a variable to make gdb happy. */ -const int __linuxthreads_pthread_sizeof_descr - = sizeof(struct _pthread_descr_struct); - /* Indicate whether at least one thread has a user-defined stack (if 1), or if all threads have stacks supplied by LinuxThreads (if 0). */ int __pthread_nonstandard_stacks; diff --git a/libpthread/linuxthreads/pthread.c b/libpthread/linuxthreads/pthread.c index ace6ac9eb..42127d03e 100644 --- a/libpthread/linuxthreads/pthread.c +++ b/libpthread/linuxthreads/pthread.c @@ -193,6 +193,9 @@ const int __pthread_offsetof_descr = offsetof(struct pthread_handle_struct, h_descr); const int __pthread_offsetof_pid = offsetof(struct _pthread_descr_struct, p_pid); +const int __linuxthreads_pthread_sizeof_descr + = sizeof(struct _pthread_descr_struct); + /* Forward declarations */ diff --git a/libpthread/linuxthreads/specific.c b/libpthread/linuxthreads/specific.c index 120bb13df..3df0e4720 100644 --- a/libpthread/linuxthreads/specific.c +++ b/libpthread/linuxthreads/specific.c @@ -27,8 +27,9 @@ static struct pthread_key_struct pthread_keys[PTHREAD_KEYS_MAX] = { { 0, NULL } }; -/* Put the maximum number of keys in a variable to make gdb happy. */ +/* For debugging purposes put the maximum number of keys in a variable. */ const int __linuxthreads_pthread_keys_max = PTHREAD_KEYS_MAX; +const int __linuxthreads_pthread_key_2ndlevel_size = PTHREAD_KEY_2NDLEVEL_SIZE; /* Mutex to protect access to pthread_keys */ diff --git a/libpthread/linuxthreads_db/td_symbol_list.c b/libpthread/linuxthreads_db/td_symbol_list.c index 707d89361..61072dbf1 100644 --- a/libpthread/linuxthreads_db/td_symbol_list.c +++ b/libpthread/linuxthreads_db/td_symbol_list.c @@ -29,7 +29,7 @@ static const char *symbol_list_arr[] = [PTHREAD_HANDLES_NUM] = "__pthread_handles_num", [PTHREAD_HANDLES] = "__pthread_handles", [PTHREAD_KEYS] = "pthread_keys", - [LINUXTHREADS_PTHREAD_THREADS_MAX] = "__pthread_threads_max", + [LINUXTHREADS_PTHREAD_THREADS_MAX] = "__linuxthreads_pthread_threads_max", [LINUXTHREADS_PTHREAD_KEYS_MAX] = "__linuxthreads_pthread_keys_max", [LINUXTHREADS_PTHREAD_SIZEOF_DESCR] = "__linuxthreads_pthread_sizeof_descr", [LINUXTHREADS_CREATE_EVENT] = "__linuxthreads_create_event", -- cgit v1.2.3