aboutsummaryrefslogtreecommitdiff
path: root/malloc.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-01-26 05:33:35 +0000
committerUlrich Drepper <drepper@redhat.com>1997-01-26 05:33:35 +0000
commit33a934a3abdd127d2cc305f35e03dc88984bad49 (patch)
tree96b2567a8831f0702bf4ad4fe45f224869757df6 /malloc.h
parent5b82669229ad4e39c6ba1467045a2d81d44b8ccc (diff)
downloadglibc-33a934a3abdd127d2cc305f35e03dc88984bad49.zip
glibc-33a934a3abdd127d2cc305f35e03dc88984bad49.tar.gz
glibc-33a934a3abdd127d2cc305f35e03dc88984bad49.tar.bz2
update from main archive 970125cvs/libc-970126
Sun Jan 26 05:41:42 1997 Ulrich Drepper <drepper@cygnus.com> * version.h (VERSION): Bump to 2.0. (RELEASE): Now it's "experimental". * Makefile (subdirs): Change $(malloc) to malloc. We have only one malloc implementation again. * malloc/*: Remove from GNU libc. * new-malloc/* Move to malloc/. * config.make.in (defines): Remove @USE_NEW_MALLOC@. * configure.in: Remove --enable-new-malloc option and check for malloc implementation choice. * malloc.h: We don't need to check for the implementation to use anymore. Simply include malloc/malloc.h. * malloc/Makefile (subdir): Change to malloc. * sysdeps/unix/sysv/linux/configure.in: Don't set malloc anymore. * Makefile: Add special goal to call generate only-MD5 based crypt library. * md5-crypt/Makefile: Likewise. * stdio-common/tstscanf.c: De-ANSI-declfy. Update copyright. (rounds): Change type to size_t to prevent warning. * wcsmbs/btowc.c: Reformat copyright. * wcsmbs/mbrlen.c: Likewise. * wcsmbs/mbsinit.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcpcpy.c: Likewise. * wcsmbs/wcpncpy.c: Likewise. * wcsmbs/wcscat.c: Likewise. * wcsmbs/wcscmp.c: Likewise. * wcsmbs/wcscoll.c: Likewise. * wcsmbs/wcscpy.c: Likewise. * wcsmbs/wcscspn.c: Likewise. * wcsmbs/wcsdup.c: Likewise. * wcsmbs/wcslen.c: Likewise. * wcsmbs/wcsncat.c: Likewise. * wcsmbs/wcsncpy.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wcsspn.c: Likewise. * wcsmbs/wcsstr.c: Likewise. * wcsmbs/wcstod.c: Likewise. * wcsmbs/wcstof.c: Likewise. * wcsmbs/wcstok.c: Likewise. * wcsmbs/wcstol.c: Likewise. * wcsmbs/wcstold.c: Likewise. * wcsmbs/wcstoq.c: Likewise. * wcsmbs/wcstoul.c: Likewise. * wcsmbs/wcstouq.c: Likewise. * wcsmbs/wcswidth.c: Likewise. * wcsmbs/wcsxfrm.c: Likewise. * wcsmbs/wctob.c: Likewise. * wcsmbs/wcwidth.c: Likewise. * wcsmbs/wcwidth.h: Likewise. * wcsmbs/wmemchr.c: Likewise. * wcsmbs/wmemcmp.c: Likewise. * wcsmbs/wmemmove.c: Likewise. * wcsmbs/wmemset.c: Likewise. Sat Jan 25 03:34:14 1997 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/termbits.h: Protect against multiple inclusion. Reported by a sun <asun@zoology.washington.edu>. Likewise for scanf4.c * stdlib/stdlib.h: Declare reentrant function from rand48 family
Diffstat (limited to 'malloc.h')
-rw-r--r--malloc.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/malloc.h b/malloc.h
index 72873ea..448e0a8 100644
--- a/malloc.h
+++ b/malloc.h
@@ -1,5 +1 @@
-#ifdef USE_NEW_MALLOC
-# include <new-malloc/malloc.h>
-#else
-# include <malloc/malloc.h>
-#endif
+#include <malloc/malloc.h>