This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.23-317-g612fe43
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 12 May 2016 16:51:14 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-317-g612fe43
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 612fe4327577f9afaf6f45b400a737683eef9d0c (commit)
from ca927ec4c23f47b559e8e2d493caaad9c13092f6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=612fe4327577f9afaf6f45b400a737683eef9d0c
commit 612fe4327577f9afaf6f45b400a737683eef9d0c
Author: Joseph Myers <joseph@codesourcery.com>
Date: Thu May 12 16:50:43 2016 +0000
Declare gethostname for XPG4 (bug 20054).
unistd.h declares gethostname for __USE_UNIX98 || __USE_XOPEN2K. But
it's also in XPG4 (XNS volume - C438 - not the main definitions of
system interfaces and headers in C435). This patch corrects the
condition.
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).
[BZ #20054]
* posix/unistd.h (gethostname): Declare if [__USE_XOPEN_EXTENDED],
not [__USE_UNIX98].
* conform/data/unistd.h-data (gethostname): Do not expect for
[XPG3].
diff --git a/ChangeLog b/ChangeLog
index b85a293..fe723a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2016-05-12 Joseph Myers <joseph@codesourcery.com>
+ [BZ #20054]
+ * posix/unistd.h (gethostname): Declare if [__USE_XOPEN_EXTENDED],
+ not [__USE_UNIX98].
+ * conform/data/unistd.h-data (gethostname): Do not expect for
+ [XPG3].
+
* conform/data/fcntl.h-data [!POSIX] (S_IFMT): Do not expect.
[!POSIX] (S_IFBLK): Likewise.
[!POSIX] (S_IFCHR): Likewise.
diff --git a/conform/data/unistd.h-data b/conform/data/unistd.h-data
index 9c00d44..5958ff7 100644
--- a/conform/data/unistd.h-data
+++ b/conform/data/unistd.h-data
@@ -490,7 +490,7 @@ function int getgroups (int, gid_t[])
#if !defined POSIX && !defined POSIX2008
function long gethostid (void)
#endif
-#if !defined POSIX
+#if !defined POSIX && !defined XPG3
function int gethostname (char*, size_t)
#endif
function {char*} getlogin (void)
diff --git a/posix/unistd.h b/posix/unistd.h
index 7486ecf..98ffcea 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -875,7 +875,7 @@ extern int setlogin (const char *__name) __THROW __nonnull ((1));
#endif
-#if defined __USE_UNIX98 || defined __USE_XOPEN2K
+#if defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K
/* Put the name of the current host in no more than LEN bytes of NAME.
The result is null-terminated if LEN is large enough for the full
name and the terminator. */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
conform/data/unistd.h-data | 2 +-
posix/unistd.h | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources