diff options
author | Michael Kerrisk <mtk.manpages@gmail.com> | 2021-01-05 10:21:48 +0100 |
---|---|---|
committer | Michael Kerrisk <mtk.manpages@gmail.com> | 2021-01-05 11:01:22 +0100 |
commit | 58a6844d203a677105c7e1fa6e5f42154c470788 (patch) | |
tree | 6f61d6a6979a5af4d06256cd351531581ce0c57d | |
parent | 16fe373c85491e458333c34efabf0ad7118e38ed (diff) | |
download | man-pages-58a6844d203a677105c7e1fa6e5f42154c470788.tar.gz |
brk.2, chmod.2, gethostname.2, setpgid.2, wait4.2, atoi.3, fwide.3, getlogin.3, printf.3, strtoul.3, wprintf.3: Consistency fix-up in FTMs
Generally, place '||' at start of a line, rather than the end of
the previous line.
Rationale: this placement clearly indicates that that each piece
is an alternative.
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
-rw-r--r-- | man2/brk.2 | 12 | ||||
-rw-r--r-- | man2/chmod.2 | 4 | ||||
-rw-r--r-- | man2/gethostname.2 | 4 | ||||
-rw-r--r-- | man2/setpgid.2 | 4 | ||||
-rw-r--r-- | man2/wait4.2 | 6 | ||||
-rw-r--r-- | man3/atoi.3 | 2 | ||||
-rw-r--r-- | man3/fwide.3 | 4 | ||||
-rw-r--r-- | man3/getlogin.3 | 2 | ||||
-rw-r--r-- | man3/printf.3 | 2 | ||||
-rw-r--r-- | man3/strtoul.3 | 2 | ||||
-rw-r--r-- | man3/wprintf.3 | 4 |
11 files changed, 23 insertions, 23 deletions
diff --git a/man2/brk.2 b/man2/brk.2 index 9cdb0df2d2..7f735b70d0 100644 --- a/man2/brk.2 +++ b/man2/brk.2 @@ -46,17 +46,17 @@ Feature Test Macro Requirements for glibc (see .BR sbrk (): .nf Since glibc 2.19: - _DEFAULT_SOURCE || - (_XOPEN_SOURCE\ >=\ 500) && + _DEFAULT_SOURCE + || ((_XOPEN_SOURCE\ >=\ 500) && + ! (_POSIX_C_SOURCE\ >=\ 200112L)) .\" (_XOPEN_SOURCE\ >=\ 500 || .\" _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED) && - ! (_POSIX_C_SOURCE\ >=\ 200112L) From glibc 2.12 to 2.19: - _BSD_SOURCE || _SVID_SOURCE || - (_XOPEN_SOURCE\ >=\ 500) && + _BSD_SOURCE || _SVID_SOURCE + || ((_XOPEN_SOURCE\ >=\ 500) && + ! (_POSIX_C_SOURCE\ >=\ 200112L)) .\" (_XOPEN_SOURCE\ >=\ 500 || .\" _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED) && - ! (_POSIX_C_SOURCE\ >=\ 200112L) Before glibc 2.12: _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE\ >=\ 500 .\" || _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED diff --git a/man2/chmod.2 b/man2/chmod.2 index 2853e0d47f..b0238ca39f 100644 --- a/man2/chmod.2 +++ b/man2/chmod.2 @@ -61,8 +61,8 @@ Feature Test Macro Requirements for glibc (see Glibc 2.16 to 2.19: _BSD_SOURCE || _POSIX_C_SOURCE Glibc 2.12 to 2.16: - _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 || - _POSIX_C_SOURCE >= 200809L + _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 + || _POSIX_C_SOURCE >= 200809L Glibc 2.11 and earlier: _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 .\" || (_XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED) diff --git a/man2/gethostname.2 b/man2/gethostname.2 index ffb28bdd50..a92715dbbe 100644 --- a/man2/gethostname.2 +++ b/man2/gethostname.2 @@ -47,8 +47,8 @@ Feature Test Macro Requirements for glibc (see .PP .BR gethostname (): .nf - _XOPEN_SOURCE\ >=\ 500 || _POSIX_C_SOURCE\ >=\ 200112L || - /* Glibc 2.19 and earlier */ _BSD_SOURCE + _XOPEN_SOURCE\ >=\ 500 || _POSIX_C_SOURCE\ >=\ 200112L + || /* Glibc 2.19 and earlier */ _BSD_SOURCE .\" The above is something of a simplification .\" also in glibc before 2.3 there was a bit churn .fi diff --git a/man2/setpgid.2 b/man2/setpgid.2 index 66ccc79d95..1f7db5e48a 100644 --- a/man2/setpgid.2 +++ b/man2/setpgid.2 @@ -88,8 +88,8 @@ Feature Test Macro Requirements for glibc (see .nf [These are available only before glibc 2.19] _BSD_SOURCE && - !\ (_POSIX_SOURCE || _POSIX_C_SOURCE || _XOPEN_SOURCE || - _GNU_SOURCE || _SVID_SOURCE) + !\ (_POSIX_SOURCE || _POSIX_C_SOURCE || _XOPEN_SOURCE + || _GNU_SOURCE || _SVID_SOURCE) .fi .SH DESCRIPTION All of these interfaces are available on Linux, diff --git a/man2/wait4.2 b/man2/wait4.2 index faa63b30af..f45de09d1c 100644 --- a/man2/wait4.2 +++ b/man2/wait4.2 @@ -53,9 +53,9 @@ Feature Test Macro Requirements for glibc (see .BR wait3 (): .nf Since glibc 2.26: - _DEFAULT_SOURCE || - (_XOPEN_SOURCE\ >=\ 500 && - ! (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600)) + _DEFAULT_SOURCE + || (_XOPEN_SOURCE\ >=\ 500 && + ! (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600)) From glibc 2.19 to 2.25: _DEFAULT_SOURCE || _XOPEN_SOURCE\ >=\ 500 Glibc 2.19 and earlier: diff --git a/man3/atoi.3 b/man3/atoi.3 index f7e80a33f0..264c1e2ce0 100644 --- a/man3/atoi.3 +++ b/man3/atoi.3 @@ -49,7 +49,7 @@ Feature Test Macro Requirements for glibc (see .PP .BR atoll (): .nf - _ISOC99_SOURCE || + _ISOC99_SOURCE || /* Glibc <= 2.19: */ _BSD_SOURCE || _SVID_SOURCE .fi .SH DESCRIPTION diff --git a/man3/fwide.3 b/man3/fwide.3 index 6bd55295ce..48ffc9a265 100644 --- a/man3/fwide.3 +++ b/man3/fwide.3 @@ -30,8 +30,8 @@ Feature Test Macro Requirements for glibc (see .PP .BR fwide (): .nf - _XOPEN_SOURCE\ >=\ 500 || _ISOC99_SOURCE || - _POSIX_C_SOURCE\ >=\ 200112L + _XOPEN_SOURCE\ >=\ 500 || _ISOC99_SOURCE + || _POSIX_C_SOURCE\ >=\ 200112L .fi .SH DESCRIPTION When \fImode\fP is zero, the diff --git a/man3/getlogin.3 b/man3/getlogin.3 index 41ab637177..714e56f753 100644 --- a/man3/getlogin.3 +++ b/man3/getlogin.3 @@ -53,7 +53,7 @@ _POSIX_C_SOURCE\ >=\ 199506L .nf Since glibc 2.24: (_XOPEN_SOURCE && ! (_POSIX_C_SOURCE >= 200112L) - || _GNU_SOURCE + || _GNU_SOURCE Up to and including glibc 2.23: _XOPEN_SOURCE .fi diff --git a/man3/printf.3 b/man3/printf.3 index 6f1d72ccab..112350dbd4 100644 --- a/man3/printf.3 +++ b/man3/printf.3 @@ -63,7 +63,7 @@ Feature Test Macro Requirements for glibc (see .BR snprintf (), .BR vsnprintf (): .nf - _XOPEN_SOURCE\ >=\ 500 || _ISOC99_SOURCE || + _XOPEN_SOURCE\ >=\ 500 || _ISOC99_SOURCE || /* Glibc <= 2.19: */ _BSD_SOURCE .fi .PP diff --git a/man3/strtoul.3 b/man3/strtoul.3 index 5559a0ecdd..1774d605a5 100644 --- a/man3/strtoul.3 +++ b/man3/strtoul.3 @@ -50,7 +50,7 @@ Feature Test Macro Requirements for glibc (see .PP .BR strtoull (): .nf - _ISOC99_SOURCE || + _ISOC99_SOURCE || /* Glibc <= 2.19: */ _SVID_SOURCE || _BSD_SOURCE .fi .SH DESCRIPTION diff --git a/man3/wprintf.3 b/man3/wprintf.3 index a98e17ed13..a55437f060 100644 --- a/man3/wprintf.3 +++ b/man3/wprintf.3 @@ -46,8 +46,8 @@ All functions shown above: .\" .BR vfwprintf (), .\" .BR vswprintf (): .nf - _XOPEN_SOURCE\ >=\ 500 || _ISOC99_SOURCE || - _POSIX_C_SOURCE\ >=\ 200112L + _XOPEN_SOURCE\ >=\ 500 || _ISOC99_SOURCE + || _POSIX_C_SOURCE\ >=\ 200112L .fi .SH DESCRIPTION The |