Update.

2004-07-23  Ulrich Drepper  <drepper@redhat.com>

	* posix/bits/posix1_lim.h: Fix values for _POSIX_CHILD_MAX and
	_POSIX_OPEN_MAX.  Add _POSIX_HOST_NAME_MAX, _POSIX_SYMLINK_MAX,
	_POSIX_SYMLOOP_MAX, and _POSIX_RE_DUP_MAX.
	Reported by Andrew Josey.

	* include/features.h: Document _POSIX_C_SOURCE == 200112L.

	* grp/grp.h: Define gid_t if __USE_XOPEN2K is defined.
	* pwd/pwd.h: Define uid_t and gid_t if __USE_XOPEN2K is defined.
	* io/sys/stat.h: Define dev_t, gid_t, ino_t, mode_t, nlink_t,
	off_t, time_t, and uid_t if __USE_XOPEN2K is defined.
	* signal/signal.h: Define pid_t if __USE_XOPEN2K is defined.
	* posix/unistd.h: Define gid_t, off_t, pid_t, uid_t, and
	useconds_t if __USE_XOPEN2K is defined.
	* io/utime.h: Define time_t if __USE_XOPEN2K is defined.
	* libio/stdio.h: Declare fseeko and ftello if __USE_XOPEN2K is defined.

10 files changed, 67 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index 6f8ea5dd38..d46874f3e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2004-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* posix/bits/posix1_lim.h: Fix values for _POSIX_CHILD_MAX and
+	_POSIX_OPEN_MAX.  Add _POSIX_HOST_NAME_MAX, _POSIX_SYMLINK_MAX,
+	_POSIX_SYMLOOP_MAX, and _POSIX_RE_DUP_MAX.
+	Reported by Andrew Josey.
+
+	* include/features.h: Document _POSIX_C_SOURCE == 200112L.
+
+	* grp/grp.h: Define gid_t if __USE_XOPEN2K is defined.
+	* pwd/pwd.h: Define uid_t and gid_t if __USE_XOPEN2K is defined.
+	* io/sys/stat.h: Define dev_t, gid_t, ino_t, mode_t, nlink_t,
+	off_t, time_t, and uid_t if __USE_XOPEN2K is defined.
+	* signal/signal.h: Define pid_t if __USE_XOPEN2K is defined.
+	* posix/unistd.h: Define gid_t, off_t, pid_t, uid_t, and
+	useconds_t if __USE_XOPEN2K is defined.
+	* io/utime.h: Define time_t if __USE_XOPEN2K is defined.
+	* libio/stdio.h: Declare fseeko and ftello if __USE_XOPEN2K is defined.
+
 2004-07-19  Thorsten Kukuk  <kukuk@suse.de>
 
 	* nis/nss_compat/compat-initgroups.c (getgrent_next_nss): Don't
diff --git a/grp/grp.h b/grp/grp.h
index e844b254ed..d7cc69d0eb 100644
--- a/grp/grp.h
+++ b/grp/grp.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1995-2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1995-2001,2003,2004 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
@@ -34,7 +34,7 @@ __BEGIN_DECLS
 
 
 /* For the Single Unix specification we must define this type here.  */
-#if defined __USE_XOPEN && !defined __gid_t_defined
+#if (defined __USE_XOPEN || defined __USE_XOPEN2K) && !defined __gid_t_defined
 typedef __gid_t gid_t;
 # define __gid_t_defined
 #endif
diff --git a/include/features.h b/include/features.h
index f9735dc66f..59ae3c4d13 100644
--- a/include/features.h
+++ b/include/features.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993,1995-2002, 2003   Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993,1995-2003, 2004 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
@@ -27,7 +27,8 @@
    _POSIX_SOURCE	IEEE Std 1003.1.
    _POSIX_C_SOURCE	If ==1, like _POSIX_SOURCE; if >=2 add IEEE Std 1003.2;
 			if >=199309L, add IEEE Std 1003.1b-1993;
-			if >=199506L, add IEEE Std 1003.1c-1995
+			if >=199506L, add IEEE Std 1003.1c-1995;
+			if >=200112L, all of IEEE 1003.1-2004
    _XOPEN_SOURCE	Includes POSIX and XPG things.  Set to 500 if
 			Single Unix conformance is wanted, to 600 for the
 			upcoming sixth revision.
diff --git a/io/sys/stat.h b/io/sys/stat.h
index 29e9e625ff..e71006a43d 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -28,7 +28,7 @@
 #include <bits/types.h>		/* For __mode_t and __dev_t.  */
 
 #if defined __USE_XOPEN || defined __USE_MISC
-# ifdef __USE_XOPEN
+# if defined __USE_XOPEN || defined __USE_XOPEN2K
 #  define __need_time_t
 # endif
 # ifdef __USE_MISC
@@ -37,7 +37,7 @@
 # include <time.h>		/* For time_t resp. timespec.  */
 #endif
 
-#ifdef __USE_XOPEN
+#if defined __USE_XOPEN || defined __USE_XOPEN2K
 /* The Single Unix specification says that some more types are
    available here.  */
 # ifndef __dev_t_defined
diff --git a/io/utime.h b/io/utime.h
index 0687696491..587e628f1d 100644
--- a/io/utime.h
+++ b/io/utime.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 96, 97, 98, 99, 2004 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>
 
-#ifdef __USE_XOPEN
+#if defined __USE_XOPEN || defined __USE_XOPEN2K
 # define __need_time_t
 # include <time.h>
 #endif
diff --git a/libio/stdio.h b/libio/stdio.h
index bfcc553ba9..599094296a 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -1,5 +1,5 @@
 /* Define ISO C stdio on top of C++ iostreams.
-   Copyright (C) 1991,1994-2002,2003 Free Software Foundation, Inc.
+   Copyright (C) 1991,1994-2002,2003,2004 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
@@ -658,7 +658,7 @@ __END_NAMESPACE_STD
    file offset.  `long int' is not the right type.  These definitions
    are originally defined in the Large File Support API.  */
 
-#ifdef __USE_LARGEFILE
+#if defined __USE_LARGEFILE || defined __USE_XOPEN2K
 # ifndef __USE_FILE_OFFSET64
 /* Seek to a certain position on STREAM.
 
diff --git a/posix/bits/posix1_lim.h b/posix/bits/posix1_lim.h
index 9379d46f44..5176e46e9b 100644
--- a/posix/bits/posix1_lim.h
+++ b/posix/bits/posix1_lim.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993,96,98,2000,01,02,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993,96,98,2000-2003,2004 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
@@ -38,14 +38,21 @@
 #define	_POSIX_ARG_MAX		4096
 
 /* Maximum simultaneous processes per real user ID.  */
-#define	_POSIX_CHILD_MAX	6
+#define	_POSIX_CHILD_MAX	25
 
 /* Minimal number of timer expiration overruns.  */
 #define _POSIX_DELAYTIMER_MAX	32
 
+/* Maximum length of a host name (not including the terminating null)
+   as returned from the GETHOSTNAME function.  */
+#define _POSIX_HOST_NAME_MAX	255
+
 /* Maximum link count of a file.  */
 #define	_POSIX_LINK_MAX		8
 
+/* Maximum length of login name.  */
+#define	_POSIX_LOGIN_NAME_MAX	9
+
 /* Number of bytes in a terminal canonical input queue.  */
 #define	_POSIX_MAX_CANON	255
 
@@ -59,6 +66,9 @@
 /* Maximum number of supported message priorities.  */
 #define _POSIX_MQ_PRIO_MAX	32
 
+/* Number of bytes in a filename.  */
+#define	_POSIX_NAME_MAX		14
+
 /* Number of simultaneous supplementary group IDs per process.  */
 #ifdef __USE_XOPEN2K
 # define _POSIX_NGROUPS_MAX	8
@@ -67,21 +77,22 @@
 #endif
 
 /* Number of files one process can have open at once.  */
-#define	_POSIX_OPEN_MAX		16
+#define	_POSIX_OPEN_MAX		20
 
 /* Number of descriptors that a process may examine with `pselect' or
    `select'.  */
 #define	_POSIX_FD_SETSIZE	_POSIX_OPEN_MAX
 
-/* Number of bytes in a filename.  */
-#define	_POSIX_NAME_MAX		14
-
 /* Number of bytes in a pathname.  */
 #define	_POSIX_PATH_MAX		256
 
 /* Number of bytes than can be written atomically to a pipe.  */
 #define	_POSIX_PIPE_BUF		512
 
+/* The number of repeated occurrences of a BRE permitted by the
+   REGEXEC and REGCOMP functions when using the interval notation.  */
+#define _POSIX_RE_DUP_MAX	255
+
 /* Minimal number of realtime signals reserved for the application.  */
 #define _POSIX_RTSIG_MAX	8
 
@@ -100,6 +111,19 @@
 /* Number of streams a process can have open at once.  */
 #define	_POSIX_STREAM_MAX	8
 
+/* The number of bytes in a symbolic link.  */
+#define _POSIX_SYMLINK_MAX	255
+
+/* The number of symbolic links that can be traversed in the
+   resolution of a pathname in the absence of a loop.  */
+#define _POSIX_SYMLOOP_MAX	8
+
+/* Number of timer for a process.  */
+#define _POSIX_TIMER_MAX	32
+
+/* Maximum number of characters in a tty name.  */
+#define	_POSIX_TTY_NAME_MAX	9
+
 /* Maximum length of a timezone name (element of `tzname').  */
 #define	_POSIX_TZNAME_MAX	6
 
@@ -113,15 +137,6 @@
 /* Maximum number of elements in an `iovec' array.  */
 #define	_POSIX_UIO_MAXIOV	16
 
-/* Maximum number of characters in a tty name.  */
-#define	_POSIX_TTY_NAME_MAX	9
-
-/* Number of timer for a process.  */
-#define _POSIX_TIMER_MAX	32
-
-/* Maximum length of login name.  */
-#define	_POSIX_LOGIN_NAME_MAX	9
-
 /* Maximum clock resolution in nanoseconds.  */
 #define _POSIX_CLOCKRES_MIN	20000000
 
diff --git a/posix/unistd.h b/posix/unistd.h
index 13569ae727..72167483d7 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2002, 2003, 2004 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
@@ -194,7 +194,7 @@ typedef __ssize_t ssize_t;
 #define __need_NULL
 #include <stddef.h>
 
-#ifdef __USE_XOPEN
+#if defined __USE_XOPEN || defined __USE_XOPEN2K
 /* The Single Unix specification says that some more types are
    available here.  */
 # ifndef __gid_t_defined
diff --git a/pwd/pwd.h b/pwd/pwd.h
index 9a9eba43d7..e874133047 100644
--- a/pwd/pwd.h
+++ b/pwd/pwd.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1995-2001,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1995-2001,2003,2004 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
@@ -32,7 +32,7 @@ __BEGIN_DECLS
 #define __need_size_t
 #include <stddef.h>
 
-#ifdef __USE_XOPEN
+#if defined __USE_XOPEN || defined __USE_XOPEN2K
 /* The Single Unix specification says that some more types are
    available here.  */
 # ifndef __gid_t_defined
diff --git a/signal/signal.h b/signal/signal.h
index db8b0b571d..4df5603e2c 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -57,10 +57,12 @@ typedef __sigset_t sigset_t;
 #include <bits/types.h>
 #include <bits/signum.h>
 
-#ifdef __USE_XOPEN
+#if defined __USE_XOPEN || defined __USE_XOPEN2K
 # ifndef __pid_t_defined
 typedef __pid_t pid_t;
 #  define __pid_t_defined
+#endif
+#ifdef __USE_XOPEN
 # endif
 # ifndef __uid_t_defined
 typedef __uid_t uid_t;