diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-10-29 22:03:29 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-10-29 22:03:29 +0000 |
| commit | 8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5 (patch) | |
| tree | 196eec145dc3a6fb925a5b07d831b21d761d7c20 /malloc/arena.c | |
| parent | 48b752c9f6499f0de89766c94b3b1bedbfd6476e (diff) | |
| download | glibc-8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5.tar.gz glibc-8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5.tar.xz glibc-8dd5fcaca8ce7e43ed49879235f08d45d2a4a2e5.zip | |
Updated to fedora-glibc-20061029T2155 cvs/fedora-glibc-2_5_90-3
Diffstat (limited to 'malloc/arena.c')
| -rw-r--r-- | malloc/arena.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/malloc/arena.c b/malloc/arena.c index 2179174d64..1d9f952112 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -149,7 +149,7 @@ int __malloc_initialized = -1; static __malloc_ptr_t (*save_malloc_hook) (size_t __size, __const __malloc_ptr_t); -# if !defined _LIBC || !defined USE_TLS || (defined SHARED && !USE___THREAD) +# if !defined _LIBC || (defined SHARED && !USE___THREAD) static __malloc_ptr_t (*save_memalign_hook) (size_t __align, size_t __size, __const __malloc_ptr_t); # endif @@ -385,7 +385,7 @@ extern struct dl_open_hook *_dl_open_hook; libc_hidden_proto (_dl_open_hook); # endif -# if defined SHARED && defined USE_TLS && !USE___THREAD +# if defined SHARED && !USE___THREAD /* This is called by __pthread_initialize_minimal when it needs to use malloc to set up the TLS state. We cannot do the full work of ptmalloc_init (below) until __pthread_initialize_minimal has finished, @@ -428,7 +428,7 @@ ptmalloc_init (void) __malloc_initialized = 0; #ifdef _LIBC -# if defined SHARED && defined USE_TLS && !USE___THREAD +# if defined SHARED && !USE___THREAD /* ptmalloc_init_minimal may already have been called via __libc_malloc_pthread_startup, above. */ if (mp_.pagesize == 0) @@ -437,7 +437,7 @@ ptmalloc_init (void) ptmalloc_init_minimal(); #ifndef NO_THREADS -# if defined _LIBC && defined USE_TLS +# if defined _LIBC /* We know __pthread_initialize_minimal has already been called, and that is enough. */ # define NO_STARTER |