summary refs log tree commit diff
path: root/malloc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-12-19 19:51:55 +0000
committerUlrich Drepper <drepper@redhat.com>1999-12-19 19:51:55 +0000
commit762e5d483128d9dd06d22b52c5b8a918753673ca (patch)
treef0d4db78bda6e69331731cf0589134e04faef52b /malloc
parent2a505c961d490214d9801db06af253f234600a31 (diff)
downloadglibc-762e5d483128d9dd06d22b52c5b8a918753673ca.tar.gz
glibc-762e5d483128d9dd06d22b52c5b8a918753673ca.tar.xz
glibc-762e5d483128d9dd06d22b52c5b8a918753673ca.zip
Update.
1999-12-19  Andreas Jaeger  <aj@suse.de>

	* sysdeps/generic/libc-start.c: Remove declaration of
	__libc_open.  Move declaration of __libc_fcntl to ...
	* include/fcntl.h: ...here.

	* include/unistd.h: Move __libc_open and __libc_open64 to ...
	* include/fcntl.h: ...here.

	* malloc/malloc.h (__attribute_malloc__): Only define if hasn't
	happened yet.

	* malloc/Versions: __libc_freeres was exported with glibc 2.1.3,
	rename label.
Diffstat (limited to 'malloc')
-rw-r--r--malloc/Versions2
-rw-r--r--malloc/malloc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/malloc/Versions b/malloc/Versions
index 1a4454f22e..e6bd731331 100644
--- a/malloc/Versions
+++ b/malloc/Versions
@@ -44,7 +44,7 @@ libc {
     # v*
     valloc;
   }
-  GLIBC_2.1 {
+  GLIBC_2.1.3 {
     # Special functions.
     __libc_freeres;
   }
diff --git a/malloc/malloc.h b/malloc/malloc.h
index 15d4a44c1d..af908c1df8 100644
--- a/malloc/malloc.h
+++ b/malloc/malloc.h
@@ -55,7 +55,7 @@
 /* Used by GNU libc internals. */
 # define __malloc_size_t size_t
 # define __malloc_ptrdiff_t ptrdiff_t
-#else
+#elif !defined __attribute_malloc__
 # define __attribute_malloc__
 #endif