resolv: Clean up declarations of the __res_initstamp variable

diff --git a/ChangeLog b/ChangeLog
index 12f1e3bce68db05dc061f0c7c4361ec038ba7b72..3108d486417515734e47cc2cdc490affde6b2f2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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]

diff --git a/resolv/res_init.c b/resolv/res_init.c
index ed5a4d4804a792de4e553f52807c7c033cd8e623..9aa907ee199f01a6e0d918299ba9334fa8299799 100644 (file)
--- 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 3bf3887b0c5232b1fea7dcc44c3a6973507db248..f322e8ce3f1a84feeb0c7a4bfd1861882669703a 100644 (file)
--- 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 9afaa07d8b03d31feb1948c45a1d43d883fddfaf..5a9faf8de975f316fdc2a6eb55594145b5d1ac4c 100644 (file)
--- 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 */