aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-06-23 17:52:55 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-06-23 17:52:55 +0200
commitb1e7c13cc58572600809d5173fed2c00c38af2e7 (patch)
tree13a8e71fd2b8279f334d948822bc1923ffad4a88
parent3ec7c02cc3e922b9364dc8cfd1d4546671b91003 (diff)
downloadglibc-b1e7c13cc58572600809d5173fed2c00c38af2e7.zip
glibc-b1e7c13cc58572600809d5173fed2c00c38af2e7.tar.gz
glibc-b1e7c13cc58572600809d5173fed2c00c38af2e7.tar.bz2
resolv: Clean up declarations of the __res_initstamp variable
-rw-r--r--ChangeLog7
-rw-r--r--resolv/res_init.c2
-rw-r--r--resolv/res_libc.c2
-rw-r--r--resolv/resolv-internal.h3
4 files changed, 12 insertions, 2 deletions
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 */