From: Roland McGrath Date: Mon, 7 Mar 2005 22:46:24 +0000 (+0000) Subject: 2005-03-01 Alfred M. Szmidt X-Git-Tag: cvs/glibc-2_3_5~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e881cb4fe7fec8d13826b9cdf9f86e21b7f9230;p=thirdparty%2Fglibc.git 2005-03-01 Alfred M. Szmidt [BZ #777] * malloc/arena.c: #include outside of [SHARED && USE_TLS && !USE___THREAD]. --- diff --git a/malloc/arena.c b/malloc/arena.c index 026f2c78226..8202aaf01b1 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -1,5 +1,5 @@ /* Malloc implementation for multiple threads without lock contention. - Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Wolfram Gloger , 2001. @@ -20,6 +20,8 @@ /* $Id$ */ +#include + /* Compile-time constants. */ #define HEAP_MIN_SIZE (32*1024) @@ -353,8 +355,6 @@ libc_hidden_proto (_dl_open_hook); # endif # if defined SHARED && defined USE_TLS && !USE___THREAD -# include - /* 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,