summary refs log tree commit diff
path: root/posix
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-12-02 21:32:48 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-12-02 21:32:48 +0000
commit266865c0e7b79d4196e2cc393693463f03c90bd8 (patch)
treeaccef236a3f6874245cd0ce67ea3c47489d56409 /posix
parent84e5e75640afe10758ea647e4704e9f66dc82df4 (diff)
downloadglibc-266865c0e7b79d4196e2cc393693463f03c90bd8.tar.gz
glibc-266865c0e7b79d4196e2cc393693463f03c90bd8.tar.xz
glibc-266865c0e7b79d4196e2cc393693463f03c90bd8.zip
Remove excess declarations from unistd.h for XPG3/XPG4 (bug 17665).
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).

	[BZ #17665]
	* posix/unistd.h [__USE_MISC || (__USE_XOPEN && !__USE_UNIX98)]:
	Change conditional to [__USE_MISC].
Diffstat (limited to 'posix')
-rw-r--r--posix/unistd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/posix/unistd.h b/posix/unistd.h
index ac81d92c1e..59b3139ed7 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)