about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nptl/ChangeLog7
-rw-r--r--posix/bits/posix1_lim.h12
3 files changed, 22 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 709af2f5e9..14d7891433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* posix/bits/posix1_lim.h (_POSIX_CHILD_MAX, _POSIX_OPEN_MAX): If
+	not __USE_XOPEN2K, use the Unix98 mandated values.
+
 2004-08-27  Roland McGrath  <roland@redhat.com>
 
 	* configure.in (usetls): Default to yes.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index d9eb8ba453..2aa77d9133 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h: Include
+	bits/wordsize.h.  Make the header match i386 header when __WORDSIZE
+	!= 64.
+	* sysdeps/unix/sysv/linux/x86_64/bits/semaphore.h: Likewise.
+
 2004-08-15  Roland McGrath  <roland@frob.com>
 
 	* pthread_atfork.c: Update copyright terms including special exception
diff --git a/posix/bits/posix1_lim.h b/posix/bits/posix1_lim.h
index 5176e46e9b..71c58f7605 100644
--- a/posix/bits/posix1_lim.h
+++ b/posix/bits/posix1_lim.h
@@ -38,7 +38,11 @@
 #define	_POSIX_ARG_MAX		4096
 
 /* Maximum simultaneous processes per real user ID.  */
-#define	_POSIX_CHILD_MAX	25
+#ifdef __USE_XOPEN2K
+# define _POSIX_CHILD_MAX	25
+#else
+# define _POSIX_CHILD_MAX	6
+#endif
 
 /* Minimal number of timer expiration overruns.  */
 #define _POSIX_DELAYTIMER_MAX	32
@@ -77,7 +81,11 @@
 #endif
 
 /* Number of files one process can have open at once.  */
-#define	_POSIX_OPEN_MAX		20
+#ifdef __USE_XOPEN2K
+# define _POSIX_OPEN_MAX	20
+#else
+# define _POSIX_OPEN_MAX	16
+#endif
 
 /* Number of descriptors that a process may examine with `pselect' or
    `select'.  */