From 3ba63d802e1d857f8138fbdeaf9fe239563d1351 Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Sun, 26 Sep 2010 17:16:57 +0200 Subject: [PATCH] chdir.2, chmod.2, chown.2, gethostname.2, getsid.2, pread.2, setpgid.2, sigaltstack.2, stat.2, truncate.2, wait.2, dirfd.3, getsubopt.3, mkdtemp.3, mkstemp.3, siginterrupt.3, strdup.3: Simplify feature test macro requirements Signed-off-by: Michael Kerrisk --- man2/chdir.2 | 11 +++-------- man2/chmod.2 | 11 ++--------- man2/chown.2 | 9 ++------- man2/gethostname.2 | 7 ++----- man2/getsid.2 | 9 ++------- man2/pread.2 | 7 ++----- man2/setpgid.2 | 9 ++------- man2/sigaltstack.2 | 9 ++------- man2/stat.2 | 9 ++------- man2/truncate.2 | 9 ++------- man2/wait.2 | 10 ++-------- man3/dirfd.3 | 12 +++++------- man3/getsubopt.3 | 10 +++------- man3/mkdtemp.3 | 13 +++++-------- man3/mkstemp.3 | 9 ++------- man3/siginterrupt.3 | 9 ++------- man3/strdup.3 | 9 ++------- 17 files changed, 42 insertions(+), 120 deletions(-) diff --git a/man2/chdir.2 b/man2/chdir.2 index 42fac0bf46..7e29d063d3 100644 --- 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 1022cc3f21..49fad6abb1 100644 --- 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 ba5dac14dd..d7e2bb5627 100644 --- 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 a2867bc2b6..e266f5af95 100644 --- 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 079dd618c9..ed758135ba 100644 --- 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 22d1abbac7..35494babd8 100644 --- 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 69fcc2cbf3..efe9574a05 100644 --- 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 66df9fdc89..99bcd3911d 100644 --- 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 da61998997..5552dd3d4b 100644 --- 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 b67ceefb4b..bb7658ca24 100644 --- 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 556ed236da..6add71dc80 100644 --- 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 3d2e80b4a1..1f13fca294 100644 --- 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 4058e436ff..07c5cb269d 100644 --- 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 46b85da50d..266bff5a9d 100644 --- 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 6a7db369f8..fafa07c5f6 100644 --- 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 32d6e9e6f0..b84855563f 100644 --- 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 43cbc84167..a9dc1f9b20 100644 --- 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 (): -- 2.39.5