diff options
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/arena.c | 8 | ||||
| -rw-r--r-- | malloc/hooks.c | 4 | ||||
| -rw-r--r-- | malloc/malloc.c | 2 |
3 files changed, 7 insertions, 7 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 diff --git a/malloc/hooks.c b/malloc/hooks.c index 708f0faf83..8346e73453 100644 --- a/malloc/hooks.c +++ b/malloc/hooks.c @@ -1,5 +1,5 @@ /* Malloc implementation for multiple threads without lock contention. - Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Wolfram Gloger <wg@malloc.de>, 2001. @@ -414,7 +414,7 @@ memalign_check(alignment, bytes, caller) #ifndef NO_THREADS # ifdef _LIBC -# if USE___THREAD || (defined USE_TLS && !defined SHARED) +# if USE___THREAD || !defined SHARED /* These routines are never needed in this configuration. */ # define NO_STARTER # endif diff --git a/malloc/malloc.c b/malloc/malloc.c index 4cbce0455b..d15ed57bd7 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1618,7 +1618,7 @@ static Void_t* memalign_check(size_t alignment, size_t bytes, const Void_t *caller); #ifndef NO_THREADS # ifdef _LIBC -# if USE___THREAD || (defined USE_TLS && !defined SHARED) +# if USE___THREAD || !defined SHARED /* These routines are never needed in this configuration. */ # define NO_STARTER # endif |