This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH COMMITTED] resolv: Clean up declarations of the __res_initstamp variable
- From: fweimer at redhat dot com (Florian Weimer)
- To: libc-alpha at sourceware dot org
- Date: Fri, 23 Jun 2017 17:56:33 +0200
- Subject: [PATCH COMMITTED] resolv: Clean up declarations of the __res_initstamp variable
- Authentication-results: sourceware.org; auth=none
- Authentication-results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
- Authentication-results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=fweimer at redhat dot com
- Dkim-filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7A63CC012874
- Dmarc-filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7A63CC012874
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.
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 */