Update.

2004-08-11  Andreas Schwab  <schwab@suse.de>

	* resolv/res_libc.c: Move definition of __res_initstamp ...
	* resolv/res_init.c: ... here.

diff --git a/ChangeLog b/ChangeLog
index f36367880316092d0f5461d0936c9f2e7ef8f318..88966804ca7681475109700e7671cbdc0515bbce 100644 (file)
--- 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 078480cb614aeede55fa22424e99b7ec0d72309a..e9392f46e557b9243a0b86c42a3969b6abef1e0b 100644 (file)
--- 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 e41cf0fe4d45798c2d48c18d5d5f1d5a296457cd..76abca84429dbb661c24ac9cfb815b8e4bf04781 100644 (file)
--- 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