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.

diff --git a/ChangeLog b/ChangeLog
index cdec130..07d9190 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+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.
+
 1999-12-19  Ulrich Drepper  <drepper@cygnus.com>
 
        * sysdeps/unix/sysv/linux/bits/resource.h: Remove <asm/resource.h>

diff --git a/include/fcntl.h b/include/fcntl.h
index 8714d6a..fae0beb 100644 (file)
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -3,4 +3,8 @@
 
 /* Now define the internal interfaces.  */
 extern int __open64 (__const char *__file, int __oflag, ...);
+extern int __libc_open64 (const char *file, int oflag, ...);
+extern int __libc_open (const char *file, int oflag, ...);
+extern int __libc_fcntl (int fd, int cmd, ...);
+
 #endif

diff --git a/include/unistd.h b/include/unistd.h
index d8fc6cc..24e035b 100644 (file)
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -4,8 +4,6 @@
 /* Now define the internal interfaces.  */
 extern int __access (__const char *__name, int __type);
 extern int __euidaccess (__const char *__name, int __type);
-extern int __libc_open64 (const char *file, int oflag, ...);
-extern int __libc_open (const char *file, int oflag, ...);
 extern __off64_t __lseek64 (int __fd, __off64_t __offset, int __whence);
 extern __off64_t __libc_lseek64 (int __fd, __off64_t __offset, int __whence);
 extern ssize_t __pread (int __fd, void *__buf, size_t __nbytes,

diff --git a/malloc/Versions b/malloc/Versions
index 1a4454f..e6bd731 100644 (file)
--- 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 15d4a44..af908c1 100644 (file)
--- 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
 

diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index ea3cbe6..7c0bc58 100644 (file)
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -25,8 +25,6 @@
 #include <elf/ldsodefs.h>
 
 extern void __libc_init_first (int argc, char **argv, char **envp);
-extern int __libc_fcntl (int fd, int cmd, ...);
-extern int __libc_open  (const char *pathname, int flags, ...);
 
 extern int _dl_starting_up;
 weak_extern (_dl_starting_up)