aboutsummaryrefslogtreecommitdiff
path: root/malloc/malloc.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-02-22 05:09:06 +0000
committerUlrich Drepper <drepper@redhat.com>2000-02-22 05:09:06 +0000
commitbfaf0bbb7d2b7a1adbcc1e61625bd5ea29547fac (patch)
treebeef21aa27f47555d25bdf25ba5f28ba4365a74e /malloc/malloc.c
parent782a9fe711d6d94226ce03f50fdaa3da37686c39 (diff)
downloadglibc-bfaf0bbb7d2b7a1adbcc1e61625bd5ea29547fac.tar
glibc-bfaf0bbb7d2b7a1adbcc1e61625bd5ea29547fac.tar.gz
glibc-bfaf0bbb7d2b7a1adbcc1e61625bd5ea29547fac.tar.bz2
glibc-bfaf0bbb7d2b7a1adbcc1e61625bd5ea29547fac.zip
Update.
2000-02-21 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/bits/in.h (IPV6_RXSRCRT): Renamed to IPV6_RTHDR; added IPV6_RTHDR_LOOSE, IPV6_RTHDR_STRICT and IPV6_RTHDR_TYPE_0 to synch with RFC 2292. * sysdeps/generic/bits/in.h: Likewise. 2000-02-21 Ulrich Drepper <drepper@redhat.com> * po/gl.po: Update from translation team. * timezone/antarctica: Update from tzdata2000b. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/europe: Likewise. * malloc/malloc.c (vALLOc): Call ptmalloc_init before mEMALIGn call to initialize malloc_getpagesize. (pvALLOc): Likewise.
Diffstat (limited to 'malloc/malloc.c')
-rw-r--r--malloc/malloc.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 9f564adb63..645bcbe2dd 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1,5 +1,5 @@
/* Malloc implementation for multiple threads without lock contention.
- Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
and Doug Lea <dl@cs.oswego.edu>, 1996.
@@ -3618,6 +3618,8 @@ Void_t* vALLOc(size_t bytes)
Void_t* vALLOc(bytes) size_t bytes;
#endif
{
+ if(__malloc_initialized < 0)
+ ptmalloc_init ();
return mEMALIGn (malloc_getpagesize, bytes);
}
@@ -3633,7 +3635,10 @@ Void_t* pvALLOc(size_t bytes)
Void_t* pvALLOc(bytes) size_t bytes;
#endif
{
- size_t pagesize = malloc_getpagesize;
+ size_t pagesize;
+ if(__malloc_initialized < 0)
+ ptmalloc_init ();
+ pagesize = malloc_getpagesize;
return mEMALIGn (pagesize, (bytes + pagesize - 1) & ~(pagesize - 1));
}