From d05445341998d5099f4868caaa6b959da47faed6 Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Mon, 8 Feb 2016 09:01:55 +0100 Subject: [PATCH] acct.2, getdomainname.2, gethostname.2, vhangup.2, daemon.3, gethostid.3, getusershell.3, profil.3: Update feature test macro requirements Update to use _DEFAULT_SOURCE, and also changes brought by glibc commit 266865c0e7b79d4196e2cc393693463f03c90bd8. Signed-off-by: Michael Kerrisk --- man2/acct.2 | 10 +++++++++- man2/getdomainname.2 | 12 +++++++++--- man2/gethostname.2 | 12 +++++++++--- man2/vhangup.2 | 10 +++++++++- man3/daemon.3 | 10 +++++++++- man3/gethostid.3 | 12 +++++++++--- man3/getusershell.3 | 12 +++++++++--- man3/profil.3 | 10 +++++++++- 8 files changed, 72 insertions(+), 16 deletions(-) diff --git a/man2/acct.2 b/man2/acct.2 index 03a2cf284..a90dd9a3c 100644 --- a/man2/acct.2 +++ b/man2/acct.2 @@ -46,7 +46,15 @@ Feature Test Macro Requirements for glibc (see .in .sp .BR acct (): -_BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) +.nf + Since glibc 2.21: +.\" commit 266865c0e7b79d4196e2cc393693463f03c90bd8 + _DEFAULT_SOURCE + In glibc 2.19 and 2.20: + _DEFAULT_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) + Up to and including glibc 2.19: + _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) +.fi .SH DESCRIPTION The .BR acct () diff --git a/man2/getdomainname.2 b/man2/getdomainname.2 index ffdcb1134..dfe781a81 100644 --- a/man2/getdomainname.2 +++ b/man2/getdomainname.2 @@ -44,9 +44,15 @@ Feature Test Macro Requirements for glibc (see .ad l .BR getdomainname (), .BR setdomainname (): -.RS 4 -_BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) -.RE +.nf + Since glibc 2.21: +.\" commit 266865c0e7b79d4196e2cc393693463f03c90bd8 + _DEFAULT_SOURCE + In glibc 2.19 and 2.20: + _DEFAULT_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) + Up to and including glibc 2.19: + _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) +.fi .ad .SH DESCRIPTION These functions are used to access or to change the NIS domain name of the diff --git a/man2/gethostname.2 b/man2/gethostname.2 index 544112bd3..032107938 100644 --- a/man2/gethostname.2 +++ b/man2/gethostname.2 @@ -55,9 +55,15 @@ _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 .RE .br .BR sethostname (): -.RS 4 -_BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) -.RE +.nf + Since glibc 2.21: +.\" commit 266865c0e7b79d4196e2cc393693463f03c90bd8 + _DEFAULT_SOURCE + In glibc 2.19 and 2.20: + _DEFAULT_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) + Up to and including glibc 2.19: + _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) +.fi .PD .ad .SH DESCRIPTION diff --git a/man2/vhangup.2 b/man2/vhangup.2 index 2fad8c3c1..29e8df9ad 100644 --- a/man2/vhangup.2 +++ b/man2/vhangup.2 @@ -40,7 +40,15 @@ Feature Test Macro Requirements for glibc (see .sp .ad l .BR vhangup (): -_BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) +.nf + Since glibc 2.21: +.\" commit 266865c0e7b79d4196e2cc393693463f03c90bd8 + _DEFAULT_SOURCE + In glibc 2.19 and 2.20: + _DEFAULT_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) + Up to and including glibc 2.19: + _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) +.fi .ad b .SH DESCRIPTION .BR vhangup () diff --git a/man3/daemon.3 b/man3/daemon.3 index 36cd1554d..0e6591487 100644 --- a/man3/daemon.3 +++ b/man3/daemon.3 @@ -47,7 +47,15 @@ Feature Test Macro Requirements for glibc (see .in .sp .BR daemon (): -_BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) +.nf + Since glibc 2.21: +.\" commit 266865c0e7b79d4196e2cc393693463f03c90bd8 + _DEFAULT_SOURCE + In glibc 2.19 and 2.20: + _DEFAULT_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) + Up to and including glibc 2.19: + _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) +.fi .SH DESCRIPTION The .BR daemon () diff --git a/man3/gethostid.3 b/man3/gethostid.3 index fbfcc9427..5e5acce83 100644 --- a/man3/gethostid.3 +++ b/man3/gethostid.3 @@ -49,9 +49,15 @@ _BSD_SOURCE || _XOPEN_SOURCE\ >=\ 500 || _XOPEN_SOURCE\ &&\ _XOPEN_SOURCE_EXTENDED .RE .BR sethostid (): -.RS 4 -_BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) -.RE +.nf + Since glibc 2.21: +.\" commit 266865c0e7b79d4196e2cc393693463f03c90bd8 + _DEFAULT_SOURCE + In glibc 2.19 and 2.20: + _DEFAULT_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) + Up to and including glibc 2.19: + _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) +.fi .ad b .SH DESCRIPTION .BR gethostid () diff --git a/man3/getusershell.3 b/man3/getusershell.3 index da439c661..869c89ff5 100644 --- a/man3/getusershell.3 +++ b/man3/getusershell.3 @@ -50,9 +50,15 @@ Feature Test Macro Requirements for glibc (see .BR getusershell (), .BR setusershell (), .BR endusershell (): -.RS 4 -_BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) -.RE +.nf + Since glibc 2.21: +.\" commit 266865c0e7b79d4196e2cc393693463f03c90bd8 + _DEFAULT_SOURCE + In glibc 2.19 and 2.20: + _DEFAULT_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) + Up to and including glibc 2.19: + _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) +.fi .ad b .SH DESCRIPTION The diff --git a/man3/profil.3 b/man3/profil.3 index 15d9a9e0f..149199099 100644 --- a/man3/profil.3 +++ b/man3/profil.3 @@ -42,7 +42,15 @@ Feature Test Macro Requirements for glibc (see .in .sp .BR profil (): -_BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) +.nf + Since glibc 2.21: +.\" commit 266865c0e7b79d4196e2cc393693463f03c90bd8 + _DEFAULT_SOURCE + In glibc 2.19 and 2.20: + _DEFAULT_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) + Up to and including glibc 2.19: + _BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE\ <\ 500) +.fi .SH DESCRIPTION This routine provides a means to find out in what areas your program spends most of its time.