Update.

1998-07-09 13:34  Ulrich Drepper  <drepper@cygnus.com>

	* grp/grp.h: Define gid_t also for __USE_XOPEN.
	* io/fcntl.h: Include <sys/stat.h> also for __USE_XOPEN.
	* io/utime.h: Define time_t also for __USE_XOPEN.
	* io/sys/stat.h: Define time_t also for __USE_XOPEN.
	Define *_t types except for pid_t also for __USE_XOPEN.
	Define S_* macros also for __USE_XOPEN.
	* locale/langinfo.h: Define CODESET, CRNCYSTR, RADIXCHAR, and
	THOUSEP also for __USE_XOPEN.
	* math/math.c: Define M_* macros also for __USE_XOPEN.
	* math/bits/mathcalls.h: Declare hypot also for __USE_XOPEN.
	* posix/fnmatch.h: Define FNM_NOSYS and for if _XOPEN_SOURCE is
	defined.
	* posix/glob.h: Likewise for GLOB_NOSYS.
	* posix/regex.h: Likewise for REG_NOSYS.
	* posix/wordexp.h: Likewise for WRDE_NOSYS.
	* posix/unistd.h: Define *_t types also for __USE_XOPEN.
	* posix/sys/wait.h: Define pid_t for __USE_XOPEN.
	* pwd/pwd.h: Define gid_t and pid_t also for __USE_XOPEN.
	* signal/signal.h: Define pid_t also fir __USE_XOPEN.
	* sysdeps/unix/sysv/linux/bits/fcntl.h: Define _RSYNC and O_DSYNC also
	for __USE_POSIX199309.
	* sysdeps/unix/sysv/linux/bits/termios.h: Define the various B*
	constants also for __USE_XOPEN.
	* wcsmbs/wchar.h: For XPG4 include wctype.h.

	* intl/dcgettext.c (find_msg): Initialize act to prevent warning.
	* locale/setlocale.c (new_composite_name): Likewise for last_len.

	* libio/stdio.h: Don't declare fclose_unlocked.

	* sysdeps/posix/fpathconf.c: Handle _PC_FILESIZEBITS.

1998-07-08  Mark Kettenis  <kettenis@phys.uva.nl>

	* stdio/stdio.h: Add prototypes for fflush_unlocked,
	getc_unlocked, getchar_unlocked, putc_unlocked, putchar_unlocked,
	fgets_unlocked, fread_unlocked, fwrite_unlocked,
	clearerr_unlocked, feof_unlocked, ferror_unlocked,
	fileno_unlocked, flockfile, ftrylockfile, funlockfile.
	[__USE_XOPEN && !__USE_GNU] Declare optarg, optind, opterr.  Add
	prototype for getopt.
	* stdio/clearerr.c (clearerr_unlocked): Weak alias for clearerr.
	* stdio/feof.c (feof_unlocked): Weak alias for feof.
	* stdio/ferror.c (ferror_unlocked): Weak alias for ferror.
	* stdio/fflush.c (fflush_unlocked): Weak alias for fflush.
	* stdio/fgets.c (fgets_unlocked): Weak alias for fgets.
	* stdio/fileno.c (fileno_unlocked): Weak alias for fileno.
	* stdio/fputc.c (fputc_unlocked): Weak alias for fputc.
	* stdio/fread.c (fread_unlocked): Weak alias for fread.
	* stdio/fwrite.c (fwrite_unlocked): Weak alias for fwrite.
	* stdio/getc.c (getchar_unlocked): Weak alias for getc.
	* stdio/getchar.c (getchar_unlocked): Weak alias for getchar.
	* stdio/putc.c (putc_unlocked): Weak alias for putc.
	* stdio/putchar.c (putchar_unlocked): Weak alias for putchar.
	* stdio/Versions [GLIBC_2.1]: Add clearerr_unlocked,
	feof_unlocked, ferror_unlocked, fflush_unlocked, fgets_unlocked,
	fileno_unlocked, fputc_unlocked, fread_unlocked, fwrite_unlocked,
	getc_unlocked, getchar_unlocked, putc_unlocked and
	putchar_unlocked.

	* libio/Versions: Move flockfile, ftrylockfile and funlockfile
	from here ...
	* stdio-common/Versions: ... to here.

1998-07-09  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* Makerules (versioning): Correct typo.

37 files changed, 307 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d23e62944..79b11a3d00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,73 @@
+1998-07-09 13:34  Ulrich Drepper  <drepper@cygnus.com>
+
+	* grp/grp.h: Define gid_t also for __USE_XOPEN.
+	* io/fcntl.h: Include <sys/stat.h> also for __USE_XOPEN.
+	* io/utime.h: Define time_t also for __USE_XOPEN.
+	* io/sys/stat.h: Define time_t also for __USE_XOPEN.
+	Define *_t types except for pid_t also for __USE_XOPEN.
+	Define S_* macros also for __USE_XOPEN.
+	* locale/langinfo.h: Define CODESET, CRNCYSTR, RADIXCHAR, and
+	THOUSEP also for __USE_XOPEN.
+	* math/math.c: Define M_* macros also for __USE_XOPEN.
+	* math/bits/mathcalls.h: Declare hypot also for __USE_XOPEN.
+	* posix/fnmatch.h: Define FNM_NOSYS and for if _XOPEN_SOURCE is
+	defined.
+	* posix/glob.h: Likewise for GLOB_NOSYS.
+	* posix/regex.h: Likewise for REG_NOSYS.
+	* posix/wordexp.h: Likewise for WRDE_NOSYS.
+	* posix/unistd.h: Define *_t types also for __USE_XOPEN.
+	* posix/sys/wait.h: Define pid_t for __USE_XOPEN.
+	* pwd/pwd.h: Define gid_t and pid_t also for __USE_XOPEN.
+	* signal/signal.h: Define pid_t also fir __USE_XOPEN.
+	* sysdeps/unix/sysv/linux/bits/fcntl.h: Define _RSYNC and O_DSYNC also
+	for __USE_POSIX199309.
+	* sysdeps/unix/sysv/linux/bits/termios.h: Define the various B*
+	constants also for __USE_XOPEN.
+	* wcsmbs/wchar.h: For XPG4 include wctype.h.
+
+	* intl/dcgettext.c (find_msg): Initialize act to prevent warning.
+	* locale/setlocale.c (new_composite_name): Likewise for last_len.
+
+	* libio/stdio.h: Don't declare fclose_unlocked.
+
+	* sysdeps/posix/fpathconf.c: Handle _PC_FILESIZEBITS.
+
+1998-07-08  Mark Kettenis  <kettenis@phys.uva.nl>
+
+	* stdio/stdio.h: Add prototypes for fflush_unlocked,
+	getc_unlocked, getchar_unlocked, putc_unlocked, putchar_unlocked,
+	fgets_unlocked, fread_unlocked, fwrite_unlocked,
+	clearerr_unlocked, feof_unlocked, ferror_unlocked,
+	fileno_unlocked, flockfile, ftrylockfile, funlockfile.
+	[__USE_XOPEN && !__USE_GNU] Declare optarg, optind, opterr.  Add
+	prototype for getopt.
+	* stdio/clearerr.c (clearerr_unlocked): Weak alias for clearerr.
+	* stdio/feof.c (feof_unlocked): Weak alias for feof.
+	* stdio/ferror.c (ferror_unlocked): Weak alias for ferror.
+	* stdio/fflush.c (fflush_unlocked): Weak alias for fflush.
+	* stdio/fgets.c (fgets_unlocked): Weak alias for fgets.
+	* stdio/fileno.c (fileno_unlocked): Weak alias for fileno.
+	* stdio/fputc.c (fputc_unlocked): Weak alias for fputc.
+	* stdio/fread.c (fread_unlocked): Weak alias for fread.
+	* stdio/fwrite.c (fwrite_unlocked): Weak alias for fwrite.
+	* stdio/getc.c (getchar_unlocked): Weak alias for getc.
+	* stdio/getchar.c (getchar_unlocked): Weak alias for getchar.
+	* stdio/putc.c (putc_unlocked): Weak alias for putc.
+	* stdio/putchar.c (putchar_unlocked): Weak alias for putchar.
+	* stdio/Versions [GLIBC_2.1]: Add clearerr_unlocked,
+	feof_unlocked, ferror_unlocked, fflush_unlocked, fgets_unlocked,
+	fileno_unlocked, fputc_unlocked, fread_unlocked, fwrite_unlocked,
+	getc_unlocked, getchar_unlocked, putc_unlocked and
+	putchar_unlocked.
+
+	* libio/Versions: Move flockfile, ftrylockfile and funlockfile
+	from here ...
+	* stdio-common/Versions: ... to here.
+
+1998-07-09  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* Makerules (versioning): Correct typo.
+
 1998-07-08 22:18  Ulrich Drepper  <drepper@cygnus.com>
 
 	* elf/Versions: Add _dl_mcount_wrapper_check.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 4c4cfdf84c..b6406691ed 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -7,6 +7,10 @@
 	* mutex.c: Define __pthread_mutexattr_gettype and
 	__pthread_mutexattr_settype.
 	* weak.c: Likewise.
+	* sysdeps/pthread/pthread.h: Declare __pthread_mutexattr_gettype and
+	__pthread_mutexattr_settype.
+	* sysdeps/pthread/bits/libc-lock.h (__libc_lock_init_recursive):
+	Use __pthread_mutexattr_settype.
 
 1998-07-08 22:26  Ulrich Drepper  <drepper@cygnus.com>
 
diff --git a/linuxthreads/sysdeps/pthread/bits/libc-lock.h b/linuxthreads/sysdeps/pthread/bits/libc-lock.h
index ed64cbfa0f..7d336bed52 100644
--- a/linuxthreads/sysdeps/pthread/bits/libc-lock.h
+++ b/linuxthreads/sysdeps/pthread/bits/libc-lock.h
@@ -63,7 +63,7 @@ typedef pthread_key_t __libc_key_t;
       {									      \
 	pthread_mutexattr_t __attr;					      \
 	__pthread_mutexattr_init (&__attr);				      \
-	__pthread_mutexattr_setkind_np (&__attr, PTHREAD_MUTEX_RECURSIVE_NP); \
+	__pthread_mutexattr_settype (&__attr, PTHREAD_MUTEX_RECURSIVE_NP); \
 	__pthread_mutex_init (&(NAME), &__attr);			      \
 	__pthread_mutexattr_destroy (&__attr);				      \
       }									      \
diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h
index 5ae6211c85..6d2bd0f2fa 100644
--- a/linuxthreads/sysdeps/pthread/pthread.h
+++ b/linuxthreads/sysdeps/pthread/pthread.h
@@ -318,10 +318,14 @@ extern int pthread_mutexattr_destroy __P ((pthread_mutexattr_t *__attr));
 /* Set the mutex kind attribute in *ATTR to KIND (either PTHREAD_MUTEX_NORMAL,
    PTHREAD_MUTEX_RECURSIVE, PTHREAD_MUTEX_ERRORCHECK, or
    PTHREAD_MUTEX_DEFAULT).  */
+extern int __pthread_mutexattr_settype __P ((pthread_mutexattr_t *__attr,
+					     int __kind));
 extern int pthread_mutexattr_settype __P ((pthread_mutexattr_t *__attr,
 					   int __kind));
 
 /* Return in *KIND the mutex kind attribute in *ATTR. */
+extern int __pthread_mutexattr_gettype __P ((__const pthread_mutexattr_t *__attr,
+					     int *__kind));
 extern int pthread_mutexattr_gettype __P ((__const pthread_mutexattr_t *__attr,
 					   int *__kind));
 #endif
diff --git a/locale/langinfo.h b/locale/langinfo.h
index 10e8dd249e..31fae92fe2 100644
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -1,5 +1,5 @@
 /* Access to locale-dependent parameters.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 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
@@ -207,7 +207,7 @@ enum
   _NL_CTYPE_WIDTH,
   _NL_CTYPE_MB_CUR_MAX,
   _NL_CTYPE_CODESET_NAME,
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
   CODESET = _NL_CTYPE_CODESET_NAME,
 #endif
   _NL_NUM_LC_CTYPE,
@@ -219,7 +219,7 @@ enum
 #define INT_CURR_SYMBOL		INT_CURR_SYMBOL
   CURRENCY_SYMBOL,
 #define CURRENCY_SYMBOL		CURRENCY_SYMBOL
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
   CRNCYSTR = CURRENCY_SYMBOL,
 # define CRNCYSTR			CRNCYSTR
 #endif
@@ -255,13 +255,13 @@ enum
      These also correspond to members of `struct lconv'; see <locale.h>.  */
   DECIMAL_POINT = _NL_ITEM (LC_NUMERIC, 0),
 #define DECIMAL_POINT		DECIMAL_POINT
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
   RADIXCHAR = DECIMAL_POINT,
 # define RADIXCHAR		RADIXCHAR
 #endif
   THOUSANDS_SEP,
 #define THOUSANDS_SEP		THOUSANDS_SEP
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
   THOUSEP = THOUSANDS_SEP,
 #define THOUSANDS_SEP		THOUSANDS_SEP
 #endif
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 54ca416887..cde5b6a4fc 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -133,7 +133,7 @@ __libc_lock_define_initialized (, __libc_setlocale_lock)
 static inline char *
 new_composite_name (int category, const char *newnames[LC_ALL])
 {
-  size_t last_len;
+  size_t last_len = 0;
   size_t cumlen = 0;
   int i;
   char *new, *p;
diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h
index 67e86a7d51..30bbb7c0aa 100644
--- a/math/bits/mathcalls.h
+++ b/math/bits/mathcalls.h
@@ -145,10 +145,12 @@ __MATHCALL (pow,, (_Mdouble_ __x, _Mdouble_ __y));
 /* Return the square root of X.  */
 __MATHCALL (sqrt,, (_Mdouble_ __x));
 
-#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X
+#if defined __USE_MISC || defined __USE_XOPEN || defined __USE_ISOC9X
 /* Return `sqrt(X*X + Y*Y)'.  */
 __MATHCALL (hypot,, (_Mdouble_ __x, _Mdouble_ __y));
+#endif
 
+#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED || defined __USE_ISOC9X
 /* Return the cube root of X.  */
 __MATHCALL (cbrt,, (_Mdouble_ __x));
 #endif
diff --git a/math/math.h b/math/math.h
index a5d5b504f2..2ac6f11032 100644
--- a/math/math.h
+++ b/math/math.h
@@ -269,7 +269,7 @@ extern int matherr __P ((struct exception *__exc));
 
 
 /* Some useful constants.  */
-#if defined __USE_BSD || defined __USE_UNIX98
+#if defined __USE_BSD || defined __USE_XOPEN
 # define M_E		2.7182818284590452354	/* e */
 # define M_LOG2E	1.4426950408889634074	/* log_2 e */
 # define M_LOG10E	0.43429448190325182765	/* log_10 e */
diff --git a/posix/fnmatch.h b/posix/fnmatch.h
index 4d1eb3e2d3..0966ee301a 100644
--- a/posix/fnmatch.h
+++ b/posix/fnmatch.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 96, 97, 98 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
@@ -66,7 +66,7 @@ extern "C" {
    `fnmatch'.  Since this is not the case here it will never be
    returned but the conformance test suites still require the symbol
    to be defined.  */
-#if (_XOPEN_SOURCE - 0) == 500
+#ifdef _XOPEN_SOURCE
 # define FNM_NOSYS	(-1)
 #endif
 
diff --git a/posix/glob.h b/posix/glob.h
index 0b7808b15c..5a8e48c196 100644
--- a/posix/glob.h
+++ b/posix/glob.h
@@ -84,7 +84,7 @@ extern "C" {
    `glob'.  Since this is not the case here it will never be
    returned but the conformance test suites still require the symbol
    to be defined.  */
-#if (_XOPEN_SOURCE - 0) == 500
+#ifdef _XOPEN_SOURCE
 # define GLOB_NOSYS	(-1)
 #endif
 
diff --git a/posix/regex.h b/posix/regex.h
index 0efef36e66..2bca5378a4 100644
--- a/posix/regex.h
+++ b/posix/regex.h
@@ -282,7 +282,7 @@ extern reg_syntax_t re_syntax_options;
    `re_error_msg' table in regex.c.  */
 typedef enum
 {
-#if (_XOPEN_SOURCE - 0) == 500
+#ifdef _XOPEN_SOURCE
   REG_ENOSYS = -1,	/* This will never happen for this implementation.  */
 #endif
 
diff --git a/posix/sys/wait.h b/posix/sys/wait.h
index ed904d909b..1eeac91200 100644
--- a/posix/sys/wait.h
+++ b/posix/sys/wait.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 93, 94, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 96, 97, 98 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
@@ -29,7 +29,7 @@ __BEGIN_DECLS
 
 #include <bits/types.h>
 
-#if defined __USE_UNIX98 && !defined pid_t
+#if defined __USE_XOPEN && !defined pid_t
 typedef __pid_t pid_t;
 # define pid_t pid_t
 #endif
diff --git a/posix/unistd.h b/posix/unistd.h
index fa28d94d1e..d56c56d45a 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -198,7 +198,7 @@ typedef __ssize_t ssize_t;
 #define __need_NULL
 #include <stddef.h>
 
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
 /* The Single Unix specification says that some more types are
    available here.  */
 # ifndef gid_t
@@ -228,7 +228,9 @@ typedef __off64_t off64_t;
 typedef __pid_t pid_t;
 #  define pid_t pid_t
 # endif
+#endif	/* X/Open */
 
+#ifdef __USE_UNIX98
 # ifndef intptr_t
 typedef __intptr_t intptr_t;
 #  define intptr_t intptr_t
@@ -1055,7 +1057,7 @@ extern void swab __P ((__const __ptr_t __from, __ptr_t __to, ssize_t __n));
 
 /* The Single Unix specification, version 2, demands these prototypes
    to be here.  They are also found in <stdio.h>.  */
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
 /* Return the name of the controlling terminal.  */
 extern char *ctermid __P ((char *__s));
 
@@ -1063,7 +1065,12 @@ extern char *ctermid __P ((char *__s));
    used and might go away some time.  */
 extern char *cuserid __P ((char *__s));
 
+/* Rename file OLD to NEW.  */
+extern int rename __P ((__const char *__old, __const char *__new));
+#endif
+
 
+#if defined __USE_POSIX199309 || defined __USE_UNIX98
 /* This function is only available if the system has POSIX threads.  */
 
 /* Install handlers to be called when a new process is created with FORK.
diff --git a/posix/wordexp.h b/posix/wordexp.h
index cd5fba9b41..2bdce27f93 100644
--- a/posix/wordexp.h
+++ b/posix/wordexp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1996, 1997, 1998 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
@@ -47,7 +47,7 @@ typedef struct
 /* Possible nonzero return values from `wordexp'.  */
 enum
   {
-#ifdef __USE_UNIX98
+#ifdef __USE_XOPEN
     WRDE_NOSYS = -1,		/* Never used since we suppo