Some minor nits in last big patch round

[Andreas Jaeger]

Looking through the large patch Uli checked in, I've noticed a few
minor nits in the glibc 2.2 branch:
- __libc_freeres should have version 2.1.3.
- the default definition for __attribute_malloc__ in <malloc.h>
  overwrites the one from <sys/cdefs.h> for external programs.  It
  should be removed.
- open is declared in <fcntl.h>, __libc_open* should therefore be
  declared in include/fcntl.h.
- libc-start.c declares __libc_open and __libc_fcntl - I moved those
  to include/fcntl.h as well.

The patch for include/fcntl.h  should also go into glibc 2.1.3 (with
the addition of __libc_lseek to unistd.h).

Andreas

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__): Remove default
	definition for __attribute_malloc__.

	* malloc/Versions: __libc_freeres was exported with glibc 2.1.3,
	rename label.

============================================================
Index: sysdeps/generic/libc-start.c
--- sysdeps/generic/libc-start.c	1999/12/19 03:01:22	1.10
+++ sysdeps/generic/libc-start.c	1999/12/19 09:51:28
@@ -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)
============================================================
Index: include/fcntl.h
--- include/fcntl.h	1999/11/23 17:20:31	1.5
+++ include/fcntl.h	1999/12/19 09:51:28
@@ -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
============================================================
Index: include/unistd.h
--- include/unistd.h	1999/12/19 05:57:14	1.9
+++ include/unistd.h	1999/12/19 09:51:28
@@ -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,
============================================================
Index: malloc/Versions
--- malloc/Versions	1999/12/19 00:24:21	1.2
+++ malloc/Versions	1999/12/19 09:51:28
@@ -44,7 +44,7 @@
     # v*
     valloc;
   }
-  GLIBC_2.1 {
+  GLIBC_2.1.3 {
     # Special functions.
     __libc_freeres;
   }

============================================================
Index: malloc/malloc.h
--- malloc/malloc.h	1999/12/19 08:42:35	1.16
+++ malloc/malloc.h	1999/12/19 10:00:00
@@ -55,8 +55,6 @@
 /* Used by GNU libc internals. */
 # define __malloc_size_t size_t
 # define __malloc_ptrdiff_t ptrdiff_t
-#else
-# define __attribute_malloc__
 #endif
 
 #ifdef __GNUC__

-- 
 Andreas Jaeger
  SuSE Labs aj@suse.de
   private aj@arthur.rhein-neckar.de