Update.

2001-02-06  Andreas Jaeger  <aj@suse.de>

	* include/pthread.h: New file.

	* wctype/wctype.h: Move internal interfaces from here to...
	* include/wctype.h: ...here.

	* wcsmbs/wchar.h: Move __wcslen from here to...
	* include/wchar.h: ...here.

	* posix/sys/wait.h: Move __wait from here to...
	* include/sys/wait.h: ...here.

	* string/string.h: Move __ffs and __strerror_r from here to...
	* include/string.h: ...here.

	* stdlib/stdlib.h: Move __on_exit from here to...
	* include/stdlib.h: ...here.

	* libio/stdio.h: Move __vsnprintf from here to...
	* include/stdio.h: ...here.

diff --git a/ChangeLog b/ChangeLog
index 610e99b..eabf4a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2001-02-06  Andreas Jaeger  <aj@suse.de>
+
+       * include/pthread.h: New file.
+
+       * wctype/wctype.h: Move internal interfaces from here to...
+       * include/wctype.h: ...here.
+
+       * wcsmbs/wchar.h: Move __wcslen from here to...
+       * include/wchar.h: ...here.
+
+       * posix/sys/wait.h: Move __wait from here to...
+       * include/sys/wait.h: ...here.
+
+       * string/string.h: Move __ffs and __strerror_r from here to...
+       * include/string.h: ...here.
+
+       * stdlib/stdlib.h: Move __on_exit from here to...
+       * include/stdlib.h: ...here.
+
+       * libio/stdio.h: Move __vsnprintf from here to...
+       * include/stdio.h: ...here.
+
 2001-02-06  Andreas Schwab  <schwab@suse.de>
 
        * sysdeps/unix/sysv/linux/ia64/ioperm.c: Don't include kernel

diff --git a/include/pthread.h b/include/pthread.h
new file mode 100644 (file)
index 0000000..fb37db1
--- /dev/null
+++ b/include/pthread.h
@@ -0,0 +1,6 @@
+#include_next <pthread.h>
+
+/* This function is called to initialize the pthread library.  */
+extern void __pthread_initialize (void) __attribute__ ((weak));
+
+extern void __pthread_initialize_minimal (void) __attribute__ ((weak));

diff --git a/include/stdio.h b/include/stdio.h
index 4fe3bb0..7619108 100644 (file)
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -14,6 +14,9 @@ extern int __fcloseall (void);
 extern int __snprintf (char *__restrict __s, size_t __maxlen,
                       __const char *__restrict __format, ...)
      __attribute__ ((__format__ (__printf__, 3, 4)));
+extern int __vsnprintf (char *__restrict __s, size_t __maxlen,
+                       __const char *__restrict __format, _G_va_list __arg)
+     __attribute__ ((__format__ (__printf__, 3, 0)));
 extern int __vfscanf (FILE *__restrict __s,
                      __const char *__restrict __format,
                      _G_va_list __arg)

diff --git a/include/stdlib.h b/include/stdlib.h
index 12fce40..675ed76 100644 (file)
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -54,6 +54,8 @@ extern int __add_to_environ (const char *name, const char *value,
 extern void _quicksort (void *const pbase, size_t total_elems,
                        size_t size, __compar_fn_t cmp);
 
+extern int __on_exit (void (*__func) (int __status, void *__arg), void *__arg);
+
 extern int __cxa_atexit (void (*func) (void *), void *arg, void *d);
 
 extern void __cxa_finalize (void *d);

diff --git a/include/string.h b/include/string.h
index d27a8eb..7d268ec 100644 (file)
--- a/include/string.h
+++ b/include/string.h
@@ -39,7 +39,11 @@ extern void *__memrchr (__const void *__s, int __c, size_t __n)
 
 extern void *__memchr (__const void *__s, int __c, size_t __n)
      __attribute_pure__;
-     
+
+extern int __ffs (int __i) __attribute__ ((const));
+
+extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen);
+
 /* Now the real definitions.  We do this here since some of the functions
    above are defined as macros in the headers.  */
 #include <string/string.h>

diff --git a/include/sys/wait.h b/include/sys/wait.h
index 37873df..ebaa199 100644 (file)
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@@ -6,6 +6,7 @@ extern __pid_t __waitpid (__pid_t __pid, int *__stat_loc,
                          int __options);
 extern __pid_t __libc_waitpid (pid_t __pid, int *__stat_loc, int __options);
 extern __pid_t __libc_wait (int *__stat_loc);
+extern __pid_t __wait (__WAIT_STATUS __stat_loc);
 extern __pid_t __wait3 (__WAIT_STATUS __stat_loc,
                        int __options, struct rusage * __usage);
 extern __pid_t __wait4 (__pid_t __pid, __WAIT_STATUS __stat_loc,

diff --git a/include/wchar.h b/include/wchar.h
index c6cc9cb..6f580b4 100644 (file)
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -8,6 +8,7 @@ extern int __wcscasecmp (__const wchar_t *__s1, __const wchar_t *__s2)
 extern int __wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2,
                          size_t __n)
      __attribute_pure__;
+extern size_t __wcslen (__const wchar_t *__s) __attribute_pure__;
 extern size_t __wcsnlen (__const wchar_t *__s, size_t __maxlen)
      __attribute_pure__;
 extern wint_t __btowc (int __c);

diff --git a/include/wctype.h b/include/wctype.h
index f1a00f8..2a94491 100644 (file)
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -2,6 +2,11 @@
 
 #include <wctype/wctype.h>
 
+/* Internal interfaces.  */
 extern int __iswspace (wint_t __wc);
+extern int __iswctype (wint_t __wc, wctype_t __desc);
+extern wctype_t __wctype (__const char *__property);
+extern wint_t __towctrans (wint_t __wc, wctrans_t __desc);
+
 
 #endif

diff --git a/libio/stdio.h b/libio/stdio.h
index 4c8cea6..7f10fe5 100644 (file)
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -293,9 +293,6 @@ extern int snprintf (char *__restrict __s, size_t __maxlen,
                     __const char *__restrict __format, ...)
      __THROW __attribute__ ((__format__ (__printf__, 3, 4)));
 
-extern int __vsnprintf (char *__restrict __s, size_t __maxlen,
-                       __const char *__restrict __format, _G_va_list __arg)
-     __THROW __attribute__ ((__format__ (__printf__, 3, 0)));
 extern int vsnprintf (char *__restrict __s, size_t __maxlen,
                      __const char *__restrict __format, _G_va_list __arg)
      __THROW __attribute__ ((__format__ (__printf__, 3, 0)));

diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index 1f43f77..226bab1 100644 (file)
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -106,7 +106,6 @@ typedef enum
 
 /* Wait for a child to die.  When one does, put its status in *STAT_LOC
    and return its process ID.  For errors, return (pid_t) -1.  */
-extern __pid_t __wait (__WAIT_STATUS __stat_loc) __THROW;
 extern __pid_t wait (__WAIT_STATUS __stat_loc) __THROW;
 
 #ifdef __USE_BSD

diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 9b5d187..5d410af 100644 (file)
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -568,8 +568,6 @@ extern int atexit (void (*__func) (void)) __THROW;
 #ifdef __USE_MISC
 /* Register a function to be called with the status
    given to `exit' and the given argument.  */
-extern int __on_exit (void (*__func) (int __status, void *__arg), void *__arg)
-     __THROW;
 extern int on_exit (void (*__func) (int __status, void *__arg), void *__arg)
      __THROW;
 #endif

diff --git a/string/string.h b/string/string.h
index 3491170..6aee6e1 100644 (file)
--- a/string/string.h
+++ b/string/string.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,95,96,97,98,99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,95,96,97,98,99,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -230,7 +230,6 @@ extern char *strerror (int __errnum) __THROW;
 #ifdef __USE_MISC
 /* Reentrant version of `strerror'.  If a temporary buffer is required, at
    most BUFLEN bytes of BUF will be used.  */
-extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen) __THROW;
 extern char *strerror_r (int __errnum, char *__buf, size_t __buflen) __THROW;
 #endif
 
@@ -257,7 +256,6 @@ extern char *rindex (__const char *__s, int __c) __THROW __attribute_pure__;
 
 /* Return the position of the first bit set in I, or 0 if none are set.
    The least-significant bit is position 1, the most-significant 32.  */
-extern int __ffs (int __i) __THROW __attribute__ ((const));
 extern int ffs (int __i) __THROW __attribute__ ((const));
 
 /* The following two functions are non-standard but necessary for non-32 bit

diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 0c0d8a0..aa2d195 100644 (file)
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -217,7 +217,6 @@ extern wchar_t *wcstok (wchar_t *__restrict __s,
                        wchar_t **__restrict __ptr) __THROW;
 
 /* Return the number of wide characters in S.  */
-extern size_t __wcslen (__const wchar_t *__s) __THROW __attribute_pure__;
 extern size_t wcslen (__const wchar_t *__s) __THROW __attribute_pure__;
 
 #ifdef __USE_GNU

diff --git a/wctype/wctype.h b/wctype/wctype.h
index a89eae0..0ef675c 100644 (file)
--- a/wctype/wctype.h
+++ b/wctype/wctype.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -175,12 +175,10 @@ extern int iswblank (wint_t __wc) __THROW;
 
 /* Construct value that describes a class of wide characters identified
    by the string argument PROPERTY.  */
-extern wctype_t __wctype (__const char *__property) __THROW;
 extern wctype_t wctype (__const char *__property) __THROW;
 
 /* Determine whether the wide-character WC has the property described by
    DESC.  */
-extern int __iswctype (wint_t __wc, wctype_t __desc) __THROW;
 extern int iswctype (wint_t __wc, wctype_t __desc) __THROW;
 
 #if __GNUC__ >= 2 && defined __OPTIMIZE__
@@ -256,9 +254,6 @@ extern wint_t towlower (wint_t __wc) __THROW;
 /* Converts an lowercase letter to the corresponding uppercase letter.  */
 extern wint_t towupper (wint_t __wc) __THROW;
 
-/* Map the wide character WC using the mapping described by DESC.  */
-extern wint_t __towctrans (wint_t __wc, wctrans_t __desc) __THROW;
-
 #if __GNUC__ >= 2 && defined __OPTIMIZE__
 /* The tables are always organized in a way which allows direct access
    for single byte characters.  */