AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolv: Clean up declarations of the __res_initstamp variable

Browse Source
This commit is contained in:
Florian Weimer 2017-06-23 17:52:55 +02:00
parent 3ec7c02cc3
commit b1e7c13cc5
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2017-06-23 Florian Weimer <fweimer@redhat.com>
[BZ #21662] [BZ #21662]

2
resolv/res_init.c
View File

@ -105,7 +105,7 @@
static void res_setoptions (res_state, const char *, const char *); static void res_setoptions (res_state, const char *, const char *);
static uint32_t net_mask (struct in_addr); static uint32_t net_mask (struct in_addr);
unsigned long long int __res_initstamp attribute_hidden; unsigned long long int __res_initstamp;
int int
res_ninit (res_state statp) res_ninit (res_state statp)

2
resolv/res_libc.c
View File

@ -25,8 +25,8 @@
#include <arpa/nameser.h> #include <arpa/nameser.h>
#include <resolv.h> #include <resolv.h>
#include <libc-lock.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. */ /* We have atomic increment operations on 64-bit platforms. */
#if __WORDSIZE == 64 #if __WORDSIZE == 64
# define atomicinclock(lock) (void) 0 # define atomicinclock(lock) (void) 0

3
resolv/resolv-internal.h
View File

@ -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 *); int __inet_pton_length (int af, const char *src, size_t srclen, void *);
libc_hidden_proto (__inet_pton_length) 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 */ #endif /* _RESOLV_INTERNAL_H */