[PATCH] Remove usage of __BIND_NOSTATIC
sjhill@realitydiluted.com
sjhill@realitydiluted.com
Sat Dec 31 17:11:00 GMT 2005
Greetings.
It appears that __BIND_NOSTATIC never gets defined anywhere. Is there some
reason this is still being checked for? Attached is patch to remove the usage
of it if I am correct. Thanks.
-Steve
2005-12-31 Steven J. Hill <sjhill@realitydiluted.com>
* include/resolv.h: Remove use of __BIND_NOSTATIC.
* resolv/res_data.c: Remove use of __BIND_NOSTATIC.
* resolv/resolv.h: Remove use of __BIND_NOSTATIC.
Index: include/resolv.h
===================================================================
RCS file: /cvs/glibc/libc/include/resolv.h,v
retrieving revision 1.21
diff -u -r1.21 resolv.h
--- include/resolv.h 17 Nov 2005 18:47:35 -0000 1.21
+++ include/resolv.h 31 Dec 2005 17:02:37 -0000
@@ -24,10 +24,8 @@
extern __thread struct __res_state *__resp attribute_tls_model_ie;
# endif
# else
-# ifndef __BIND_NOSTATIC
-# undef _res
+# undef _res
extern struct __res_state _res;
-# endif
# endif
/* Now define the internal interfaces. */
Index: resolv/res_data.c
===================================================================
RCS file: /cvs/glibc/libc/resolv/res_data.c,v
retrieving revision 1.14
diff -u -r1.14 res_data.c
--- resolv/res_data.c 1 Nov 2005 00:04:00 -0000 1.14
+++ resolv/res_data.c 31 Dec 2005 17:02:54 -0000
@@ -68,7 +68,6 @@
};
#endif
-#ifndef __BIND_NOSTATIC
#ifdef _LIBC
/* The definition has been moved to res_libc.c. */
#else
@@ -318,8 +317,6 @@
return (0);
}
#endif /*ultrix*/
-
-#endif
#include <shlib-compat.h>
Index: resolv/resolv.h
===================================================================
RCS file: /cvs/glibc/libc/resolv/resolv.h,v
retrieving revision 1.42
diff -u -r1.42 resolv.h
--- resolv/resolv.h 14 Sep 2004 04:24:47 -0000 1.42
+++ resolv/resolv.h 31 Dec 2005 17:02:48 -0000
@@ -238,7 +238,6 @@
__END_DECLS
#define _res (*__res_state())
-#ifndef __BIND_NOSTATIC
#define fp_nquery __fp_nquery
#define fp_query __fp_query
#define hostalias __hostalias
@@ -268,7 +267,6 @@
int res_search (const char *, int, int, u_char *, int) __THROW;
int res_send (const u_char *, int, u_char *, int) __THROW;
__END_DECLS
-#endif
#define b64_ntop __b64_ntop
#define b64_pton __b64_pton
More information about the Libc-alpha
mailing list