[COMMITTED] resolv: Clean up declarations of the __res_initstamp variable
Commit Message
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.
@@ -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)
@@ -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
@@ -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 */