summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-04-26 06:18:19 +0000
committerUlrich Drepper <drepper@redhat.com>2009-04-26 06:18:19 +0000
commit27be9b921744414cbaef55cf3ca8c77b45c39c2c (patch)
treed856ac7d573021dbfb92558ad37b0e63d61e0190
parent337c270829f7088949ba0c96fffa6326fde17f78 (diff)
downloadglibc-27be9b921744414cbaef55cf3ca8c77b45c39c2c.tar.gz
glibc-27be9b921744414cbaef55cf3ca8c77b45c39c2c.tar.xz
glibc-27be9b921744414cbaef55cf3ca8c77b45c39c2c.zip
* posix/bits/posix1_lim.h: Cleanup namespace a bit.
-rw-r--r--ChangeLog2
-rw-r--r--posix/bits/posix1_lim.h12
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9731ec602c..e8830f9a40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-04-25  Ulrich Drepper  <drepper@redhat.com>
 
+	* posix/bits/posix1_lim.h: Cleanup namespace a bit.
+
 	* sysdeps/i386/fpu/s_tan.S: Set errno for ±Inf.
 	* sysdeps/i386/fpu/s_tanf.S: Likewise.
 	* sysdeps/i386/fpu/s_tanl.S: Likewise.
diff --git a/posix/bits/posix1_lim.h b/posix/bits/posix1_lim.h
index 71c58f7605..a0eb4329cb 100644
--- a/posix/bits/posix1_lim.h
+++ b/posix/bits/posix1_lim.h
@@ -87,9 +87,11 @@
 # define _POSIX_OPEN_MAX	16
 #endif
 
+#if !defined __USE_XOPEN2K || defined __USE_GNU
 /* Number of descriptors that a process may examine with `pselect' or
    `select'.  */
-#define	_POSIX_FD_SETSIZE	_POSIX_OPEN_MAX
+# define _POSIX_FD_SETSIZE	_POSIX_OPEN_MAX
+#endif
 
 /* Number of bytes in a pathname.  */
 #define	_POSIX_PATH_MAX		256
@@ -135,15 +137,17 @@
 /* Maximum length of a timezone name (element of `tzname').  */
 #define	_POSIX_TZNAME_MAX	6
 
+#if !defined __USE_XOPEN2K || defined __USE_GNU
 /* Maximum number of connections that can be queued on a socket.  */
-#define	_POSIX_QLIMIT		1
+# define _POSIX_QLIMIT		1
 
 /* Maximum number of bytes that can be buffered on a socket for send
    or receive.  */
-#define	_POSIX_HIWAT		_POSIX_PIPE_BUF
+# define _POSIX_HIWAT		_POSIX_PIPE_BUF
 
 /* Maximum number of elements in an `iovec' array.  */
-#define	_POSIX_UIO_MAXIOV	16
+# define _POSIX_UIO_MAXIOV	16
+#endif
 
 /* Maximum clock resolution in nanoseconds.  */
 #define _POSIX_CLOCKRES_MIN	20000000