chdir.2, chmod.2, chown.2, gethostname.2, getsid.2, pread.2, setpgid.2, sigaltstack...

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>

diff --git a/man2/chdir.2 b/man2/chdir.2
index 42fac0bf466a410ee259da3f338119670767e5b1..7e29d063d34b72bf539cb2f91acb9f9787c06664 100644 (file)
--- a/man2/chdir.2
+++ b/man2/chdir.2
@@ -49,15 +49,10 @@ Feature Test Macro Requirements for glibc (see
 .PD 0
 .ad l
 .RS 4
-.TP 4
-Since glibc 2.12:
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED ||
-_POSIX_C_SOURCE\ >=\ 200809L
-.TP
-Before glibc 2.12:
-_BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED 
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200809L
 .RE
 .ad
 .PD

diff --git a/man2/chmod.2 b/man2/chmod.2
index 1022cc3f21973cc116d18011c0cbc14c061e6734..49fad6abb178f0f80785b727c09ef1e7198f13bf 100644 (file)
--- a/man2/chmod.2
+++ b/man2/chmod.2
@@ -47,18 +47,11 @@ Feature Test Macro Requirements for glibc (see
 .PD 0
 .BR fchmod ():
 .RS 4
-.TP 4
-Since glibc 2.12:
-_POSIX_C_SOURCE\ >=\ 200809L ||
 _BSD_SOURCE ||
 _XOPEN_SOURCE\ >=\ 500 ||
 _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
-.TP
-Before glibc 2.12:
-_BSD_SOURCE ||
-_XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
-.RE
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200809L ||
 .PD
 .ad
 .SH DESCRIPTION

diff --git a/man2/chown.2 b/man2/chown.2
index ba5dac14dd335eb125695721d6ec28a69df737e1..d7e2bb56275538f4ba5b7742e9c95e95f32a5690 100644 (file)
--- a/man2/chown.2
+++ b/man2/chown.2
@@ -57,15 +57,10 @@ Feature Test Macro Requirements for glibc (see
 .PD 0
 .ad l
 .RS 4
-.TP 4
-Since glibc 2.12:
-_BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED ||
-_POSIX_C_SOURCE\ >=\ 200809L
-.TP
-Before glibc 2.12:
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
 _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200809L
 .RE
 .ad
 .PD

diff --git a/man2/gethostname.2 b/man2/gethostname.2
index a2867bc2b6c554a59430f4bfd65588cd5964cbd9..e266f5af95c5854c9a9af353ede796203a7403c4 100644 (file)
--- a/man2/gethostname.2
+++ b/man2/gethostname.2
@@ -48,13 +48,10 @@ Feature Test Macro Requirements for glibc (see
 .PD 0
 .BR gethostname ():
 .RS 4
-.TP 4
 Since glibc 2.12:
-_BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
-_POSIX_C_SOURCE\ >=\ 200112L
-.TP
-Before glibc 2.12:
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200112L
 .RE
 .br
 .BR sethostname ():

diff --git a/man2/getsid.2 b/man2/getsid.2
index 079dd618c908ab47413bdfceeb6551f1590ee94a..ed758135baf8ca5a564d0fcf7ebd3043801744fd 100644 (file)
--- a/man2/getsid.2
+++ b/man2/getsid.2
@@ -39,15 +39,10 @@ Feature Test Macro Requirements for glibc (see
 .PD 0
 .BR getsid ():
 .RS 4
-.TP 4
-Since glibc 2.12:
-_POSIX_C_SOURCE\ >=\ 200809L ||
-_XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
-.TP
-Before glibc 2.12:
 _XOPEN_SOURCE\ >=\ 500 ||
 _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200809L
 .RE
 .PD
 .ad

diff --git a/man2/pread.2 b/man2/pread.2
index 22d1abbac76258409fd4a1f26c0014f9898bea94..35494babd869a2b25c8d0da1e9830a23990682d8 100644 (file)
--- a/man2/pread.2
+++ b/man2/pread.2
@@ -42,12 +42,9 @@ Feature Test Macro Requirements for glibc (see
 .BR pread (),
 .BR pwrite ():
 .RS 4
-.TP 4
-Since glibc 2.12:
-_XOPEN_SOURCE\ >=\ 500 || _POSIX_C_SOURCE\ >=\ 200809L
-.TP
-Before glibc 2.12:
 _XOPEN_SOURCE\ >=\ 500
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200809L
 .RE
 .ad
 .PD

diff --git a/man2/setpgid.2 b/man2/setpgid.2
index 69fcc2cbf34422b01e57df027f8e3e5aaa0faa8b..efe9574a056f8ab118bfdb0bd95bbe69768ecd3a 100644 (file)
--- a/man2/setpgid.2
+++ b/man2/setpgid.2
@@ -72,15 +72,10 @@ Feature Test Macro Requirements for glibc (see
 .PD 0
 .BR getpgid ():
 .RS 4
-.TP 4
-Since glibc 2.12:
-_POSIX_C_SOURCE\ >=\ 200809L ||
-_XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
-.TP
-Before glibc 2.12:
 _XOPEN_SOURCE\ >=\ 500 ||
 _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200809L
 .RE
 .sp
 .BR setpgrp "() (POSIX.1):"

diff --git a/man2/sigaltstack.2 b/man2/sigaltstack.2
index 66df9fdc894fb3affaeda93a6b5eaab6a84bf290..99bcd3911d0ce486e5d6f3b7ac9cc4d08624df45 100644 (file)
--- a/man2/sigaltstack.2
+++ b/man2/sigaltstack.2
@@ -39,15 +39,10 @@ Feature Test Macro Requirements for glibc (see
 .ad l
 .RS 4
 .PD 0
-.TP 4
-Since glibc 2.12
-_BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED ||
-_POSIX_C_SOURCE\ >=\ 200809L || _XOPEN_SOURCE\ >=\ 700
-.TP
-Before glibc 2.12
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
 _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200809L
 .PD
 .RE
 .ad

diff --git a/man2/stat.2 b/man2/stat.2
index da619989976d079e51c688026d4c0fd6a8afa900..5552dd3d4bce8ea9ec7758b58d0dacadfbfe8c1b 100644 (file)
--- a/man2/stat.2
+++ b/man2/stat.2
@@ -62,15 +62,10 @@ Feature Test Macro Requirements for glibc (see
 .sp
 .BR lstat ():
 .RS 4
-.TP 4
-Since glibc 2.10
-_POSIX_C_SOURCE\ >=\ 200112L ||
-_BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
-.TP 4
-Before glibc 2.10
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
 _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+.br
+|| /* Since glibc 2.10: */ _POSIX_C_SOURCE\ >=\ 200112L
 .RE
 .PD
 .ad

diff --git a/man2/truncate.2 b/man2/truncate.2
index b67ceefb4b2684942b1e83e1f7d7027bc0ff899b..bb7658ca24a370a516a0829ec82179675ea1b258 100644 (file)
--- a/man2/truncate.2
+++ b/man2/truncate.2
@@ -59,15 +59,10 @@ Feature Test Macro Requirements for glibc (see
 .sp
 .BR truncate ():
 .RS 4
-.TP 4
-Since glibc 2.12
-_BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED ||
-_POSIX_C_SOURCE\ >=\ 200809L
-.TP
-Before glibc 2.12:
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
 _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200809L
 .RE
 .sp
 .BR ftruncate ():

diff --git a/man2/wait.2 b/man2/wait.2
index 556ed236da80c5cd684461c262c7643576e0e475..6add71dc8090fea4b1c7c05b49b90916d8d63d17 100644 (file)
--- a/man2/wait.2
+++ b/man2/wait.2
@@ -71,17 +71,11 @@ Feature Test Macro Requirements for glibc (see
 .PD 0
 .BR waitid ():
 .RS 4
-.TP 4
-Since glibc 2.12:
-_POSIX_C_SOURCE\ >=\ 200809L ||
-_SVID_SOURCE ||
-_XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
-.TP
-Before glibc 2.12:
 _SVID_SOURCE ||
 _XOPEN_SOURCE\ >=\ 500 ||
 _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200809L
 .RE
 .PD
 .ad

diff --git a/man3/dirfd.3 b/man3/dirfd.3
index 3d2e80b4a12098c14e665206206340c56271aeca..1f13fca294efc815d75dc8d88c04ea538ef6c535 100644 (file)
--- a/man3/dirfd.3
+++ b/man3/dirfd.3
@@ -40,14 +40,12 @@ Feature Test Macro Requirements for glibc (see
 .RS 4
 .PD 0
 .ad l
-.TP 4
-Since glibc 2.10:
-_BSD_SOURCE || _SVID_SOURCE || _POSIX_C_SOURCE\ >=\ 200809L ||
-_XOPEN_SOURCE\ >=\ 700
-.br
-.TP
-Before glibc 2.10:
 _BSD_SOURCE || _SVID_SOURCE
+.br
+|| /* Since glibc 2.10: */
+.RS 4
+(_POSIX_C_SOURCE\ >=\ 200809L || _XOPEN_SOURCE\ >=\ 700)
+.RE
 .PD
 .RE
 .ad

diff --git a/man3/getsubopt.3 b/man3/getsubopt.3
index 4058e436ff17ec0dd8b46543d9a7c60c3d94ba5f..07c5cb269dd32542faa1430ce1636afc4e1cac11 100644 (file)
--- a/man3/getsubopt.3
+++ b/man3/getsubopt.3
@@ -38,14 +38,10 @@ Feature Test Macro Requirements for glibc (see
 .ad l
 .RS 4
 .PD 0
-.TP 4
-Since glibc 2.12
 _XOPEN_SOURCE\ >= 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED ||
-_POSIX_C_SOURCE\ >=\ 200809L || _XOPEN_SOURCE\ >=\ 700
-.TP
-Before glibc 2.12
-_XOPEN_SOURCE\ >=\ 500 || _XOPEN_SOURCE\ &&' _XOPEN_SOURCE_EXTENDED
+_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200809L
 .PD
 .RE
 .ad

diff --git a/man3/mkdtemp.3 b/man3/mkdtemp.3
index 46b85da50dcc289f5d9a39da87184be673a6ddff..266bff5a9de7739fb7d60acda495cdc8681cb644 100644 (file)
--- a/man3/mkdtemp.3
+++ b/man3/mkdtemp.3
@@ -41,15 +41,12 @@ Feature Test Macro Requirements for glibc (see
 .ad l
 .RS 4
 .PD 0
-.TP 4
-Since glibc 2.10:
-_BSD_SOURCE || _POSIX_C_SOURCE\ >=\ 200809L ||
-_XOPEN_SOURCE\ >=\ 700
-.ad
-.br
-.TP
-Before glibc 2.10:
 _BSD_SOURCE
+.br
+|| /* Since glibc 2.10: */
+.RS 4
+(_POSIX_C_SOURCE\ >=\ 200809L || _XOPEN_SOURCE\ >=\ 700)
+.ad
 .PD
 .RE
 .SH DESCRIPTION

diff --git a/man3/mkstemp.3 b/man3/mkstemp.3
index 6a7db369f8ce50d1266bd8aeb943c8f6bab3211f..fafa07c5f67f8c711162313089e2f4e4f1073a05 100644 (file)
--- a/man3/mkstemp.3
+++ b/man3/mkstemp.3
@@ -55,15 +55,10 @@ Feature Test Macro Requirements for glibc (see
 .ad l
 .RS 4
 .PD 0
-.TP 4
-Since glibc 2.12:
-_BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED ||
-_POSIX_C_SOURCE\ >=\ 200112L || _XOPEN_SOURCE\ >=\ 600
-.TP
-Before glibc 2.12:
 _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
 _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200112L
 .PD
 .RE
 .ad b

diff --git a/man3/siginterrupt.3 b/man3/siginterrupt.3
index 32d6e9e6f044e8e4eddf0a467077786401d3e225..b84855563f7e471ecdd1f9eb4c6aab6a711488c7 100644 (file)
--- a/man3/siginterrupt.3
+++ b/man3/siginterrupt.3
@@ -44,15 +44,10 @@ Feature Test Macro Requirements for glibc (see
 .BR siginterrupt ():
 .ad l
 .RS 4
-.TP 4
-Since glibc 2.12
-_BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED ||
-_POSIX_C_SOURCE\ >=\ 200809L || _XOPEN_SOURCE\ >=\ 700
-.TP
-Before glibc 2.12
 _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
 _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200809L
 .RE
 .ad
 .SH DESCRIPTION

diff --git a/man3/strdup.3 b/man3/strdup.3
index 43cbc84167a995ff12d1041731f5c63a666c1d84..a9dc1f9b20400e523be2077bef926025e184c394 100644 (file)
--- a/man3/strdup.3
+++ b/man3/strdup.3
@@ -51,15 +51,10 @@ Feature Test Macro Requirements for glibc (see
 .sp
 .BR strdup ():
 .RS 4
-.TP 4
-Since glibc 2.12:
-_SVID_SOURCE || _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
-_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED ||
-_POSIX_C_SOURCE\ >=\ 200809L
-.TP
-Before glibc 2.12:
 _SVID_SOURCE || _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 ||
 _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED
+.br
+|| /* Since glibc 2.12: */ _POSIX_C_SOURCE\ >=\ 200809L
 .RE
 .PP
 .BR strndup ():