GNU C Library master sources branch master updated. glibc-2.25-575-gb1e7c13

[fw at sourceware dot org]

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  b1e7c13cc58572600809d5173fed2c00c38af2e7 (commit)
      from  3ec7c02cc3e922b9364dc8cfd1d4546671b91003 (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=b1e7c13cc58572600809d5173fed2c00c38af2e7

commit b1e7c13cc58572600809d5173fed2c00c38af2e7
Author: Florian Weimer <fweimer@redhat.com>
Date:   Fri Jun 23 17:52:55 2017 +0200

    resolv: Clean up declarations of the __res_initstamp variable

diff --git a/ChangeLog b/ChangeLog
index 12f1e3b..3108d48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2017-06-23  Florian Weimer  <fweimer@redhat.com>
 
+	* resolv/resolv-internal.h (__res_initstamp): Declare.
+	* resolv/res_init.c (__res_initstamp): Remove hidden attribute.
+	It is implied by the declaration.
+	* resolv/res_libc.c (__res_initstamp): Remove declaration.
+
+2017-06-23  Florian Weimer  <fweimer@redhat.com>
+
 	[BZ #21662]
 	* sysdeps/x86_64/multiarch/memcmp-avx2-movbe.S (between_2_3):
 	Use only 24 bits of the register before the subtraction.
diff --git a/resolv/res_init.c b/resolv/res_init.c
index ed5a4d4..9aa907e 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -105,7 +105,7 @@
 static void res_setoptions (res_state, const char *, const char *);
 static uint32_t net_mask (struct in_addr);
 
-unsigned long long int __res_initstamp attribute_hidden;
+unsigned long long int __res_initstamp;
 
 int
 res_ninit (res_state statp)
diff --git a/resolv/res_libc.c b/resolv/res_libc.c
index 3bf3887..f322e8c 100644
--- a/resolv/res_libc.c
+++ b/resolv/res_libc.c
@@ -25,8 +25,8 @@
 #include <arpa/nameser.h>
 #include <resolv.h>
 #include <libc-lock.h>
+#include <resolv-internal.h>
 
-extern unsigned long long int __res_initstamp attribute_hidden;
 /* We have atomic increment operations on 64-bit platforms.  */
 #if __WORDSIZE == 64
 # define atomicinclock(lock) (void) 0
diff --git a/resolv/resolv-internal.h b/resolv/resolv-internal.h
index 9afaa07..5a9faf8 100644
--- a/resolv/resolv-internal.h
+++ b/resolv/resolv-internal.h
@@ -65,4 +65,7 @@ int __res_nopt (res_state, int n0, unsigned char *buf, int buflen,
 int __inet_pton_length (int af, const char *src, size_t srclen, void *);
 libc_hidden_proto (__inet_pton_length)
 
+/* Used to propagate the effect of res_init calls across threads.  */
+extern unsigned long long int __res_initstamp attribute_hidden;
+
 #endif  /* _RESOLV_INTERNAL_H */

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                |    7 +++++++
 resolv/res_init.c        |    2 +-
 resolv/res_libc.c        |    2 +-
 resolv/resolv-internal.h |    3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources