This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Remove excess declarations from unistd.h for XPG3/XPG4 (bug 17665)
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Sat, 29 Nov 2014 11:29:53 +0000
- Subject: Remove excess declarations from unistd.h for XPG3/XPG4 (bug 17665)
- Authentication-results: sourceware.org; auth=none
For XPG3/XPG4 (defined __USE_XOPEN && !defined __USE_UNIX98), unistd.h
declares many functions that should only be declared for __USE_MISC
(none of them are in XPG3/XPG4): sethostname sethostid getdomainname
setdomainname vhangup revoke profil acct getusershell endusershell
setusershell daemon. The whole block with the [__USE_MISC ||
(__USE_XOPEN && !__USE_UNIX98)] conditional contains only functions
that are not in XPG3/XPG4, so this patch simply changes the
conditional.
Tested for x86_64 (testsuite, and that installed stripped shared
libraries are unchanged by this patch).
2014-11-29 Joseph Myers <joseph@codesourcery.com>
[BZ #17665]
* posix/unistd.h [__USE_MISC || (__USE_XOPEN && !__USE_UNIX98)]:
Change conditional to [__USE_MISC].
diff --git a/posix/unistd.h b/posix/unistd.h
index ac81d92..59b3139 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -880,7 +880,7 @@ extern int gethostname (char *__name, size_t __len) __THROW __nonnull ((1));
#endif
-#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_UNIX98)
+#if defined __USE_MISC
/* Set the name of the current host to NAME, which is LEN bytes long.
This call is restricted to the super-user. */
extern int sethostname (const char *__name, size_t __len)
@@ -935,7 +935,7 @@ extern void setusershell (void) __THROW; /* Rewind and re-read the file. */
terminal. If NOCHDIR is zero, do `chdir ("/")'. If NOCLOSE is zero,
redirects stdin, stdout, and stderr to /dev/null. */
extern int daemon (int __nochdir, int __noclose) __THROW __wur;
-#endif /* Use misc || X/Open. */
+#endif /* Use misc. */
#if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
--
Joseph S. Myers
joseph@codesourcery.com