diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | malloc/malloc.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4437c3b67b..6060305497 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-07-30 Ulrich Drepper <drepper@cygnus.com> + + * malloc/malloc.c (ptmalloc_init): Correct last patch. The + assignment cannot be moved. + 1999-07-29 H.J. Lu <hjl@gnu.org> * malloc/malloc.c (ptmalloc_init): Also initialize __libc_pagesize diff --git a/malloc/malloc.c b/malloc/malloc.c index db12226828..143009bdfc 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1663,16 +1663,18 @@ ptmalloc_init __MALLOC_P((void)) /* Initialize the pthreads interface. */ if (__pthread_initialize != NULL) __pthread_initialize(); + __libc_pagesize = __getpagesize(); #endif mutex_init(&main_arena.mutex); mutex_init(&list_lock); tsd_key_create(&arena_key, NULL); tsd_setspecific(arena_key, (Void_t *)&main_arena); thread_atfork(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_init_all); -#endif /* !defined NO_THREADS */ +#else /* !defined NO_THREADS */ #ifdef _LIBC __libc_pagesize = __getpagesize(); #endif +#endif /* !defined NO_THREADS */ #if defined _LIBC || defined MALLOC_HOOKS if((s = getenv("MALLOC_TRIM_THRESHOLD_"))) mALLOPt(M_TRIM_THRESHOLD, atoi(s)); |