diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-08-13 05:45:12 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-08-13 05:45:12 +0000 |
| commit | 770d9b39dfacea4ec15446995d6a57906b8125d1 (patch) | |
| tree | d2a3e0634cb96e6f6a243b659f882dc9916ce097 | |
| parent | 644eff0c9fde2da05a4edcbe49d27f528286a887 (diff) | |
| download | glibc-770d9b39dfacea4ec15446995d6a57906b8125d1.tar.gz glibc-770d9b39dfacea4ec15446995d6a57906b8125d1.tar.xz glibc-770d9b39dfacea4ec15446995d6a57906b8125d1.zip | |
Update.
2004-08-11 Andreas Schwab <schwab@suse.de> * resolv/res_libc.c: Move definition of __res_initstamp ... * resolv/res_init.c: ... here.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | resolv/res_init.c | 5 | ||||
| -rw-r--r-- | resolv/res_libc.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index f363678803..88966804ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-08-11 Andreas Schwab <schwab@suse.de> + + * resolv/res_libc.c: Move definition of __res_initstamp ... + * resolv/res_init.c: ... here. + 2004-08-10 GOTO Masanori <gotom@debian.or.jp> * locale/C-time.c: Change default ERA value from NULL to "". diff --git a/resolv/res_init.c b/resolv/res_init.c index 078480cb61..e9392f46e5 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -106,6 +106,10 @@ static u_int32_t net_mask __P((struct in_addr)); # define isascii(c) (!(c & 0200)) #endif +#ifdef _LIBC +unsigned long long int __res_initstamp attribute_hidden; +#endif + /* * Resolver state default settings. */ @@ -162,7 +166,6 @@ __res_vinit(res_state statp, int preinit) { int dots; #endif #ifdef _LIBC - extern unsigned long long int __res_initstamp attribute_hidden; statp->_u._ext.initstamp = __res_initstamp; #endif diff --git a/resolv/res_libc.c b/resolv/res_libc.c index e41cf0fe4d..76abca8442 100644 --- a/resolv/res_libc.c +++ b/resolv/res_libc.c @@ -28,7 +28,7 @@ out) since res_init() should go into libc.so but the rest of that file should not. */ -unsigned long long int __res_initstamp attribute_hidden; +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 |