From a446ac0c685c0f52550cb1e5acb24c3f9b09d8af Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@gmail.com>
Date: Mon, 8 Feb 2016 10:52:51 +0100
Subject: [PATCH] brk.2, chroot.2, clock_nanosleep.2, getpagesize.2,
 posix_fadvise.2, select.2, select_tut.2, seteuid.2, clock_getcpuclockid.3,
 ecvt.3, exp2.3, fseeko.3, gcvt.3, getdtablesize.3, getpass.3, getw.3, log2.3,
 mktemp.3, mq_receive.3, mq_send.3, posix_fallocate.3, posix_madvise.3,
 posix_memalign.3, pthread_attr_setstack.3, rint.3, sem_wait.3, setenv.3,
 sockatmark.3, strerror.3: Simplify FTM requirements

Looking at <features.h> (or feature_test_macros(7)), one can
see that when _XOPEN_SOURCE is defined with the value 600
(or greater), then _POSIX_C_SOURCE is defined with the value
200112L (or greater). Therefore, terms in the man pages such as

    _XOPEN_SOURCE\ >=\ 600 || _POSIX_C_SOURCE\ >=\ 200112L

can be simpified to:

    _POSIX_C_SOURCE\ >=\ 200112L

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
---
 man2/brk.2                   | 2 +-
 man2/chroot.2                | 2 +-
 man2/clock_nanosleep.2       | 2 +-
 man2/getpagesize.2           | 5 ++---
 man2/posix_fadvise.2         | 2 +-
 man2/select.2                | 2 +-
 man2/select_tut.2            | 2 +-
 man2/seteuid.2               | 2 +-
 man3/clock_getcpuclockid.3   | 2 +-
 man3/ecvt.3                  | 4 ++--
 man3/exp2.3                  | 2 +-
 man3/fseeko.3                | 3 +--
 man3/gcvt.3                  | 2 +-
 man3/getdtablesize.3         | 3 +--
 man3/getpass.3               | 2 +-
 man3/getw.3                  | 3 +--
 man3/log2.3                  | 2 +-
 man3/mktemp.3                | 4 ++--
 man3/mq_receive.3            | 2 +-
 man3/mq_send.3               | 2 +-
 man3/posix_fallocate.3       | 2 +-
 man3/posix_madvise.3         | 2 +-
 man3/posix_memalign.3        | 2 +-
 man3/pthread_attr_setstack.3 | 2 +-
 man3/rint.3                  | 8 ++++----
 man3/sem_wait.3              | 2 +-
 man3/setenv.3                | 2 +-
 man3/sockatmark.3            | 2 +-
 man3/strerror.3              | 2 +-
 29 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/man2/brk.2 b/man2/brk.2
index be51c3f0e..deac83d9f 100644
--- a/man2/brk.2
+++ b/man2/brk.2
@@ -52,7 +52,7 @@ Since glibc 2.19:
 _DEFAULT_SOURCE ||
     (_XOPEN_SOURCE\ >=\ 500 ||
         _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED) &&
-    ! (_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600)
+    ! (_POSIX_C_SOURCE\ >=\ 200112L)
 .fi
 .TP 4
 From glibc 2.12 to 2.19:
diff --git a/man2/chroot.2 b/man2/chroot.2
index 92bbd0b62..3e3db8a08 100644
--- a/man2/chroot.2
+++ b/man2/chroot.2
@@ -53,7 +53,7 @@ Since glibc 2.2.2:
 _BSD_SOURCE ||
     (_XOPEN_SOURCE\ >=\ 500 ||
         _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED) &&
-    !(_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600)
+    ! (_POSIX_C_SOURCE\ >=\ 200112L)
 .TP 4
 .fi
 Before glibc 2.2.2: none
diff --git a/man2/clock_nanosleep.2 b/man2/clock_nanosleep.2
index d04425998..5188b6a76 100644
--- a/man2/clock_nanosleep.2
+++ b/man2/clock_nanosleep.2
@@ -45,7 +45,7 @@ Feature Test Macro Requirements for glibc (see
 .sp
 .BR clock_nanosleep ():
 .RS 4
-_XOPEN_SOURCE\ >=\ 600 || _POSIX_C_SOURCE\ >=\ 200112L
+_POSIX_C_SOURCE\ >=\ 200112L
 .RE
 .ad
 .SH DESCRIPTION
diff --git a/man2/getpagesize.2 b/man2/getpagesize.2
index 3d2289b5d..6f6b08513 100644
--- a/man2/getpagesize.2
+++ b/man2/getpagesize.2
@@ -42,13 +42,12 @@ Feature Test Macro Requirements for glibc (see
 .TP 4
 Since glibc 2.12:
 .nf
-_BSD_SOURCE ||
-    !(_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600)
+_BSD_SOURCE || ! (_POSIX_C_SOURCE\ >=\ 200112L)
 .TP 4
 .fi
 Before glibc 2.12:
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+    _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
 .PD
 .RE
 .ad b
diff --git a/man2/posix_fadvise.2 b/man2/posix_fadvise.2
index f2ecf5b1e..68ef985c7 100644
--- a/man2/posix_fadvise.2
+++ b/man2/posix_fadvise.2
@@ -44,7 +44,7 @@ Feature Test Macro Requirements for glibc (see
 .sp
 .BR posix_fadvise ():
 .RS 4
-_XOPEN_SOURCE\ >=\ 600 || _POSIX_C_SOURCE\ >=\ 200112L
+_POSIX_C_SOURCE\ >=\ 200112L
 .RE
 .ad
 .SH DESCRIPTION
diff --git a/man2/select.2 b/man2/select.2
index 5c35f116a..ffd3ab05f 100644
--- a/man2/select.2
+++ b/man2/select.2
@@ -77,7 +77,7 @@ Feature Test Macro Requirements for glibc (see
 .in
 .sp
 .BR pselect ():
-_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600
+_POSIX_C_SOURCE\ >=\ 200112L
 .SH DESCRIPTION
 .BR select ()
 and
diff --git a/man2/select_tut.2 b/man2/select_tut.2
index 90a7d66c4..148bb8994 100644
--- a/man2/select_tut.2
+++ b/man2/select_tut.2
@@ -71,7 +71,7 @@ Feature Test Macro Requirements for glibc (see
 .in
 .sp
 .BR pselect ():
-_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600
+_POSIX_C_SOURCE\ >=\ 200112L
 .SH DESCRIPTION
 .BR select ()
 (or
diff --git a/man2/seteuid.2 b/man2/seteuid.2
index b03ca404f..fd800efc2 100644
--- a/man2/seteuid.2
+++ b/man2/seteuid.2
@@ -47,7 +47,7 @@ Feature Test Macro Requirements for glibc (see
 .BR seteuid (),
 .BR setegid ():
 .RS 4
-_BSD_SOURCE || _POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600
+_BSD_SOURCE || _POSIX_C_SOURCE\ >=\ 200112L
 .RE
 .ad
 .SH DESCRIPTION
diff --git a/man3/clock_getcpuclockid.3 b/man3/clock_getcpuclockid.3
index 37a70091f..51b874e0a 100644
--- a/man3/clock_getcpuclockid.3
+++ b/man3/clock_getcpuclockid.3
@@ -43,7 +43,7 @@ Feature Test Macro Requirements for glibc (see
 .sp
 .BR clock_getcpuclockid ():
 .RS 4
-_XOPEN_SOURCE\ >=\ 600 || _POSIX_C_SOURCE\ >=\ 200112L
+_POSIX_C_SOURCE\ >=\ 200112L
 .RE
 .ad
 .SH DESCRIPTION
diff --git a/man3/ecvt.3 b/man3/ecvt.3
index 1763de727..d66b0d7ee 100644
--- a/man3/ecvt.3
+++ b/man3/ecvt.3
@@ -57,12 +57,12 @@ Since glibc 2.12:
 _SVID_SOURCE ||
     (_XOPEN_SOURCE\ >=\ 500 ||
         _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED) &&
-    !(_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600)
+    ! (_POSIX_C_SOURCE\ >=\ 200112L)
 .fi
 .TP 4
 Before glibc 2.12:
 _SVID_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+    _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
 .PD
 .RE
 .ad b
diff --git a/man3/exp2.3 b/man3/exp2.3
index 2ef2774d8..26b29d92c 100644
--- a/man3/exp2.3
+++ b/man3/exp2.3
@@ -59,7 +59,7 @@ Feature Test Macro Requirements for glibc (see
 .BR exp2f (),
 .BR exp2l ():
 .RS 4
-_XOPEN_SOURCE\ >=\ 600 || _ISOC99_SOURCE || _POSIX_C_SOURCE\ >=\ 200112L;
+_ISOC99_SOURCE || _POSIX_C_SOURCE\ >=\ 200112L;
 .br
 or
 .I cc\ -std=c99
diff --git a/man3/fseeko.3 b/man3/fseeko.3
index 108968b19..7b384c670 100644
--- a/man3/fseeko.3
+++ b/man3/fseeko.3
@@ -45,8 +45,7 @@ Feature Test Macro Requirements for glibc (see
 .br
 .RS 4
 .ad l
-_FILE_OFFSET_BITS\ ==\ 64 ||
-_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600
+_FILE_OFFSET_BITS\ ==\ 64 || _POSIX_C_SOURCE\ >=\ 200112L
 .br
 (defining the obsolete _LARGEFILE_SOURCE macro also works)
 .RE
diff --git a/man3/gcvt.3 b/man3/gcvt.3
index 84a801ea3..13d5e2dc2 100644
--- a/man3/gcvt.3
+++ b/man3/gcvt.3
@@ -52,7 +52,7 @@ Since glibc 2.12:
 _SVID_SOURCE ||
     (_XOPEN_SOURCE\ >=\ 500 ||
         _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED) &&
-    !(_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600)
+    ! (_POSIX_C_SOURCE\ >=\ 200112L)
 .fi
 .TP 4
 Before glibc 2.12:
diff --git a/man3/getdtablesize.3 b/man3/getdtablesize.3
index 7ae1b4456..8bfe82f5a 100644
--- a/man3/getdtablesize.3
+++ b/man3/getdtablesize.3
@@ -44,8 +44,7 @@ Feature Test Macro Requirements for glibc (see
 .TP 4
 Since glibc 2.12:
 .nf
-_BSD_SOURCE ||
-    !(_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600)
+_BSD_SOURCE || ! (_POSIX_C_SOURCE\ >=\ 200112L)
 .TP 4
 .fi
 Before glibc 2.12:
diff --git a/man3/getpass.3 b/man3/getpass.3
index 2a8661391..832fa5025 100644
--- a/man3/getpass.3
+++ b/man3/getpass.3
@@ -44,7 +44,7 @@ Since glibc 2.2.2:
 _BSD_SOURCE ||
     (_XOPEN_SOURCE\ >=\ 500 ||
         _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED) &&
-    !(_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600)
+    ! (_POSIX_C_SOURCE\ >=\ 200112L)
 .fi
 .TP 4
 Before glibc 2.2.2:
diff --git a/man3/getw.3 b/man3/getw.3
index 7be3c47be..4f7ee1d55 100644
--- a/man3/getw.3
+++ b/man3/getw.3
@@ -48,8 +48,7 @@ Feature Test Macro Requirements for glibc (see
 Since glibc 2.3.3:
 _SVID_SOURCE || _BSD_SOURCE ||
 .br
-(_XOPEN_SOURCE &&
-    !(_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600))
+    (_XOPEN_SOURCE && ! (_POSIX_C_SOURCE\ >=\ 200112L))
 .TP
 Before glibc 2.3.3:
 _SVID_SOURCE || _BSD_SOURCE || _XOPEN_SOURCE
diff --git a/man3/log2.3 b/man3/log2.3
index e9d4d406c..e015bf309 100644
--- a/man3/log2.3
+++ b/man3/log2.3
@@ -59,7 +59,7 @@ Feature Test Macro Requirements for glibc (see
 .BR log2f (),
 .BR log2l ():
 .RS 4
-_XOPEN_SOURCE\ >=\ 600 || _ISOC99_SOURCE || _POSIX_C_SOURCE\ >=\ 200112L;
+_ISOC99_SOURCE || _POSIX_C_SOURCE\ >=\ 200112L;
 .br
 or
 .I cc\ -std=c99
diff --git a/man3/mktemp.3 b/man3/mktemp.3
index dac825333..314f9af0b 100644
--- a/man3/mktemp.3
+++ b/man3/mktemp.3
@@ -55,11 +55,11 @@ Since glibc 2.12:
 _BSD_SOURCE || _SVID_SOURCE ||
     (_XOPEN_SOURCE\ >=\ 500 ||
          _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED) &&
-    !(_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600)
+    ! (_POSIX_C_SOURCE\ >=\ 200112L)
 .TP
 Before glibc 2.12:
 _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+    _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
 .RE
 .PD
 .ad b
diff --git a/man3/mq_receive.3 b/man3/mq_receive.3
index 423e4f29b..3586dc68e 100644
--- a/man3/mq_receive.3
+++ b/man3/mq_receive.3
@@ -51,7 +51,7 @@ Feature Test Macro Requirements for glibc (see
 .sp
 .BR mq_timedreceive ():
 .RS 4
-_XOPEN_SOURCE\ >=\ 600 || _POSIX_C_SOURCE\ >=\ 200112L
+_POSIX_C_SOURCE\ >=\ 200112L
 .RE
 .ad
 .SH DESCRIPTION
diff --git a/man3/mq_send.3 b/man3/mq_send.3
index d969c0895..9e46c6bdc 100644
--- a/man3/mq_send.3
+++ b/man3/mq_send.3
@@ -51,7 +51,7 @@ Feature Test Macro Requirements for glibc (see
 .sp
 .BR mq_timedsend ():
 .RS 4
-_XOPEN_SOURCE\ >=\ 600 || _POSIX_C_SOURCE\ >=\ 200112L
+_POSIX_C_SOURCE\ >=\ 200112L
 .RE
 .ad
 .SH DESCRIPTION
diff --git a/man3/posix_fallocate.3 b/man3/posix_fallocate.3
index 5d8965864..f68216c26 100644
--- a/man3/posix_fallocate.3
+++ b/man3/posix_fallocate.3
@@ -40,7 +40,7 @@ Feature Test Macro Requirements for glibc (see
 .sp
 .BR posix_fallocate ():
 .RS 4
-_XOPEN_SOURCE\ >=\ 600 || _POSIX_C_SOURCE\ >=\ 200112L
+_POSIX_C_SOURCE\ >=\ 200112L
 .RE
 .ad
 .SH DESCRIPTION
diff --git a/man3/posix_madvise.3 b/man3/posix_madvise.3
index e3f10a168..c13189b72 100644
--- a/man3/posix_madvise.3
+++ b/man3/posix_madvise.3
@@ -36,7 +36,7 @@ Feature Test Macro Requirements for glibc (see
 .br
 .RS 4
 .ad l
-_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600
+_POSIX_C_SOURCE >= 200112L
 .RE
 .ad
 .SH DESCRIPTION
diff --git a/man3/posix_memalign.3 b/man3/posix_memalign.3
index 6273047ff..d9aed7d96 100644
--- a/man3/posix_memalign.3
+++ b/man3/posix_memalign.3
@@ -50,7 +50,7 @@ Feature Test Macro Requirements for glibc (see
 .sp
 .ad l
 .BR posix_memalign ():
-_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600
+_POSIX_C_SOURCE\ >=\ 200112L
 .sp
 .BR aligned_alloc ():
 _ISOC11_SOURCE
diff --git a/man3/pthread_attr_setstack.3 b/man3/pthread_attr_setstack.3
index 25c82e66d..50cedbc72 100644
--- a/man3/pthread_attr_setstack.3
+++ b/man3/pthread_attr_setstack.3
@@ -48,7 +48,7 @@ Feature Test Macro Requirements for glibc (see
 .BR pthread_attr_getstack (),
 .BR pthread_attr_setstack ():
 .RS 4
-_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600
+_POSIX_C_SOURCE\ >=\ 200112L
 .RE
 .ad b
 .SH DESCRIPTION
diff --git a/man3/rint.3 b/man3/rint.3
index 97cdb865c..f46a4ebcc 100644
--- a/man3/rint.3
+++ b/man3/rint.3
@@ -57,7 +57,7 @@ Feature Test Macro Requirements for glibc (see
 .BR nearbyintf (),
 .BR nearbyintl ():
 .RS 4
-_XOPEN_SOURCE\ >=\ 600 || _POSIX_C_SOURCE\ >=\ 200112L || _ISOC99_SOURCE;
+_POSIX_C_SOURCE\ >=\ 200112L || _ISOC99_SOURCE;
 .br
 or
 .I cc\ -std=c99
@@ -67,7 +67,7 @@ or
 .RS 4
 _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
 _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED || _ISOC99_SOURCE ||
-_POSIX_C_SOURCE\ >=\ 200112L;
+_POSIX_C_SOURCE\ >=\ 200112L
 .br
 or
 .I cc\ -std=c99
@@ -76,8 +76,8 @@ or
 .BR rintf (),
 .BR rintl ():
 .RS 4
-_BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE\ >=\ 600 || _ISOC99_SOURCE ||
-_POSIX_C_SOURCE\ >=\ 200112L;
+_BSD_SOURCE || _SVID_SOURCE || _ISOC99_SOURCE ||
+_POSIX_C_SOURCE\ >=\ 200112L
 .br
 or
 .I cc\ -std=c99
diff --git a/man3/sem_wait.3 b/man3/sem_wait.3
index be328413c..51093ac98 100644
--- a/man3/sem_wait.3
+++ b/man3/sem_wait.3
@@ -45,7 +45,7 @@ Feature Test Macro Requirements for glibc (see
 .in
 .sp
 .BR sem_timedwait ():
-_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600
+_POSIX_C_SOURCE\ >=\ 200112L
 .SH DESCRIPTION
 .BR sem_wait ()
 decrements (locks) the semaphore pointed to by
diff --git a/man3/setenv.3 b/man3/setenv.3
index 82b99aa87..d2d6cd72e 100644
--- a/man3/setenv.3
+++ b/man3/setenv.3
@@ -55,7 +55,7 @@ Feature Test Macro Requirements for glibc (see
 .BR setenv (),
 .BR unsetenv ():
 .RS 4
-_BSD_SOURCE || _POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600
+_BSD_SOURCE || _POSIX_C_SOURCE\ >=\ 200112L
 .RE
 .ad b
 .SH DESCRIPTION
diff --git a/man3/sockatmark.3 b/man3/sockatmark.3
index 95ad34733..61c499abb 100644
--- a/man3/sockatmark.3
+++ b/man3/sockatmark.3
@@ -37,7 +37,7 @@ Feature Test Macro Requirements for glibc (see
 .sp
 .ad l
 .BR sockatmark ():
-_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600
+_POSIX_C_SOURCE\ >=\ 200112L
 .ad b
 .SH DESCRIPTION
 .BR sockatmark ()
diff --git a/man3/strerror.3 b/man3/strerror.3
index c09e1d6fb..2e4012eb3 100644
--- a/man3/strerror.3
+++ b/man3/strerror.3
@@ -64,7 +64,7 @@ Feature Test Macro Requirements for glibc (see
 .RS 4
 The XSI-compliant version is provided if:
 .br
-(_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600) && !\ _GNU_SOURCE
+(_POSIX_C_SOURCE\ >=\ 200112L) && ! \ _GNU_SOURCE
 .br
 Otherwise, the GNU-specific version is provided.
 .RE