From: Mark Andrews Date: Fri, 24 Jan 2003 05:03:45 +0000 (+0000) Subject: 1425. [port] linux/libbind: define __USE_MISC when testing *_r() X-Git-Tag: v9.2.3rc1~104^2~137 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=59f51f864c752d2e4bf8d1ad94404ada0c9aa6e9;p=thirdparty%2Fbind9.git 1425. [port] linux/libbind: define __USE_MISC when testing *_r() function prototypes in netdb.h. [RT #4921] --- diff --git a/CHANGES b/CHANGES index cc2a9d859e8..5b8580576e1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +1425. [port] linux/libbind: define __USE_MISC when testing *_r() + function prototypes in netdb.h. [RT #4921] + 1424. [bug] EDNS version not being correctly printed. 1423. [contrib] queryperf: added A6 and SRV. diff --git a/lib/bind/configure b/lib/bind/configure index 68b73b4a253..604a6374115 100644 --- a/lib/bind/configure +++ b/lib/bind/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.85 . +# From configure.in Revision: 1.86 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53. # @@ -12821,6 +12821,8 @@ if test $ac_cv_func_getnetbyaddr_r = yes; then #undef _REENTRANT #define _REENTRANT #define _OSF_SOURCE +#undef __USE_MISC +#define __USE_MISC #include struct netent * getnetbyaddr_r(long net, int type, struct netent *result, char *buffer, @@ -12873,6 +12875,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT #define _OSF_SOURCE +#undef __USE_MISC +#define __USE_MISC #include int getnetbyaddr_r (unsigned long int, int, struct netent *, char *, size_t, struct netent **, int *); @@ -12924,6 +12928,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT #define _OSF_SOURCE +#undef __USE_MISC +#define __USE_MISC #include extern int getnetbyaddr_r(int, int, struct netent *, struct netent_data *); @@ -12970,6 +12976,8 @@ cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include int getnetbyaddr_r (long, int, struct netent *, struct netent_data *); @@ -13138,6 +13146,8 @@ if test $ac_cv_func_setnetent_r = yes; then #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include void setnetent_r (int); @@ -13180,6 +13190,8 @@ cat >conftest.$ac_ext <<_ACEOF #include "confdefs.h" #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern int setnetent_r(int, struct netent_data *); @@ -13323,6 +13335,8 @@ if test $ac_cv_func_endnetent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include void endnetent_r (void); @@ -13365,6 +13379,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern int endnetent_r(struct netent_data *); @@ -13407,6 +13423,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern void endnetent_r(struct netent_data *); @@ -14074,6 +14092,8 @@ if test $ac_cv_func_gethostbyname_r = yes; then #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include struct hostent *gethostbyname_r (const char *name, struct hostent *hp, char *buf, int len, int *h_errnop) {} @@ -14123,6 +14143,8 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include int gethostbyname_r(const char *name, struct hostent *result, @@ -14172,6 +14194,7 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC #define __USE_MISC #include extern int gethostbyname_r (const char *, @@ -14339,6 +14362,8 @@ if test $ac_cv_func_endhostent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include int endhostent_r(struct hostent_data *buffer); @@ -14381,6 +14406,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern void endhostent_r(struct hostent_data *ht_data); @@ -14424,6 +14451,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern void endhostent_r(void); @@ -14570,6 +14599,8 @@ if test $ac_cv_func_sethostent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern void sethostent_r(int flag, struct hostent_data *ht_data); #ifdef F77_DUMMY_MAIN @@ -14609,6 +14640,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern int sethostent_r(int flag, struct hostent_data *ht_data); #ifdef F77_DUMMY_MAIN @@ -14648,6 +14681,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include void sethostent_r (int); #ifdef F77_DUMMY_MAIN @@ -14930,6 +14965,8 @@ if test $ac_cv_func_getnetgrent_r = yes; then #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include int getnetgrent_r(char **m, char **u, char **d, char *b, int l) {} @@ -14976,6 +15013,8 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include int getnetgrent_r(char **m, char **u, char **d, char *b, size_t l) {} @@ -15022,6 +15061,8 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include extern int getnetgrent_r( char **, char **, char **, void **); @@ -15478,6 +15519,8 @@ if test $ac_cv_func_getprotoent_r = yes; then #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include struct protoent *getprotoent_r(struct protoent *result, char *buffer, int buflen) {} @@ -15527,6 +15570,8 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include int getprotoent_r (struct protoent *, char *, size_t, struct protoent **); @@ -15686,6 +15731,8 @@ if test $ac_cv_func_endprotoent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include void endprotoent_r(void); @@ -15828,6 +15875,8 @@ if test $ac_cv_func_setprotoent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include void setprotoent_r __P((int)); @@ -16802,6 +16851,8 @@ if test $ac_cv_func_getservent_r = yes; then #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include struct servent * getservent_r(struct servent *result, char *buffer, int buflen) {} @@ -16849,6 +16900,8 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include int getservent_r (struct servent *, char *, size_t, struct servent **); @@ -17006,6 +17059,8 @@ if test $ac_cv_func_endservent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include void endservent_r(void); @@ -17148,6 +17203,8 @@ if test $ac_cv_func_setservent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include void setservent_r(int); diff --git a/lib/bind/configure.in b/lib/bind/configure.in index 2ddbe8a3d34..25c8287344e 100644 --- a/lib/bind/configure.in +++ b/lib/bind/configure.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -AC_REVISION($Revision: 1.85 $) +AC_REVISION($Revision: 1.86 $) AC_INIT(resolv/herror.c) AC_PREREQ(2.13) @@ -1353,6 +1353,8 @@ AC_TRY_COMPILE( #undef _REENTRANT #define _REENTRANT #define _OSF_SOURCE +#undef __USE_MISC +#define __USE_MISC #include struct netent * getnetbyaddr_r(long net, int type, struct netent *result, char *buffer, @@ -1375,6 +1377,8 @@ AC_TRY_COMPILE( #undef _REENTRANT #define _REENTRANT #define _OSF_SOURCE +#undef __USE_MISC +#define __USE_MISC #include int getnetbyaddr_r (unsigned long int, int, struct netent *, char *, size_t, struct netent **, int *); @@ -1396,6 +1400,8 @@ AC_TRY_COMPILE( #undef _REENTRANT #define _REENTRANT #define _OSF_SOURCE +#undef __USE_MISC +#define __USE_MISC #include extern int getnetbyaddr_r(int, int, struct netent *, struct netent_data *); ], @@ -1412,6 +1418,8 @@ GETNETBYADDR_ADDR_T="#define GETNETBYADDR_ADDR_T int" NETENT_DATA="#define NETENT_DATA 1" ], AC_TRY_COMPILE( +#undef __USE_MISC +#define __USE_MISC [#include int getnetbyaddr_r (long, int, struct netent *, struct netent_data *); ], @@ -1458,6 +1466,8 @@ AC_SUBST(NETENT_DATA) AC_CHECK_FUNC(setnetent_r, AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include void setnetent_r (int); ] ,[return (0);],[ @@ -1468,6 +1478,8 @@ NET_R_SET_RETURN="#define NET_R_SET_RETURN void" AC_TRY_COMPILE( [ #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern int setnetent_r(int, struct netent_data *); ] ,[return (0);],[ @@ -1491,6 +1503,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include void endnetent_r (void); ] ,[return (0);],[ @@ -1501,6 +1515,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern int endnetent_r(struct netent_data *); ] ,[return (0);],[ @@ -1511,6 +1527,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern void endnetent_r(struct netent_data *); ] ,[return (0);],[ @@ -1579,6 +1597,8 @@ AC_SUBST(GROUP_R_SET_RETURN) AC_CHECK_FUNC(gethostbyname_r, AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include struct hostent *gethostbyname_r (const char *name, struct hostent *hp, char *buf, int len, int *h_errnop) {} @@ -1597,6 +1617,8 @@ HOSTENT_DATA="#undef HOSTENT_DATA" ] , AC_TRY_COMPILE([ +#undef __USE_MISC +#define __USE_MISC #include int gethostbyname_r(const char *name, struct hostent *result, @@ -1613,6 +1635,7 @@ HOST_R_SETANSWER="#undef HOST_R_SETANSWER" HOSTENT_DATA="#define HOSTENT_DATA 1" ], AC_TRY_COMPILE([ +#undef __USE_MISC #define __USE_MISC #include extern int gethostbyname_r (const char *, @@ -1657,6 +1680,8 @@ AC_CHECK_FUNC(endhostent_r, AC_TRY_COMPILE([ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include int endhostent_r(struct hostent_data *buffer); ], , @@ -1667,6 +1692,8 @@ HOST_R_ENT_ARGS="#define HOST_R_ENT_ARGS struct hostent_data *hdptr" AC_TRY_COMPILE([ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern void endhostent_r(struct hostent_data *ht_data); ],[],[ @@ -1677,6 +1704,8 @@ HOST_R_ENT_ARGS="#define HOST_R_ENT_ARGS struct hostent_data *hdptr" AC_TRY_COMPILE([ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern void endhostent_r(void); ],[],[ @@ -1700,6 +1729,8 @@ AC_CHECK_FUNC(sethostent_r, AC_TRY_COMPILE([ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern void sethostent_r(int flag, struct hostent_data *ht_data);],[], [HOST_R_SET_RESULT="#undef HOST_R_SET_RESULT /*empty*/" @@ -1707,6 +1738,8 @@ HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void"], AC_TRY_COMPILE([ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include extern int sethostent_r(int flag, struct hostent_data *ht_data);],[], [HOST_R_SET_RESULT="#define HOST_R_SET_RESULT 0" @@ -1714,6 +1747,8 @@ HOST_R_SET_RETURN="#define HOST_R_SET_RETURN int"], AC_TRY_COMPILE([ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include void sethostent_r (int);],[], [HOST_R_SET_RESULT="#undef HOST_R_SET_RESULT" @@ -1769,6 +1804,8 @@ AC_SUBST(SETGRENT_VOID) AC_CHECK_FUNC(getnetgrent_r, AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include int getnetgrent_r(char **m, char **u, char **d, char *b, int l) {} ] @@ -1785,6 +1822,8 @@ NGR_R_RETURN="#define NGR_R_RETURN int" , AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include int getnetgrent_r(char **m, char **u, char **d, char *b, size_t l) {} ] @@ -1801,6 +1840,8 @@ NGR_R_RETURN="#define NGR_R_RETURN int" , AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include extern int getnetgrent_r( char **, char **, char **, void **); ] @@ -1874,6 +1915,8 @@ AC_CHECK_FUNC(innetgr_r,,AC_DEFINE(NEED_INNETGR_R)) AC_CHECK_FUNC(getprotoent_r, AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include struct protoent *getprotoent_r(struct protoent *result, char *buffer, int buflen) {} @@ -1893,6 +1936,8 @@ PROTO_R_RETURN="#define PROTO_R_RETURN struct protoent *" , AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include int getprotoent_r (struct protoent *, char *, size_t, struct protoent **); @@ -1934,6 +1979,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include void endprotoent_r(void); ] @@ -1959,6 +2006,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include void setprotoent_r __P((int)); ],[], @@ -2061,6 +2110,8 @@ AC_CHECK_FUNC(getpwuid_r,,AC_DEFINE(NEED_GETPWUID_R)) AC_CHECK_FUNC(getservent_r, AC_TRY_COMPILE([ +#undef __USE_MISC +#define __USE_MISC #include struct servent * getservent_r(struct servent *result, char *buffer, int buflen) {} @@ -2076,6 +2127,8 @@ SERV_R_RETURN="#define SERV_R_RETURN struct servent *" ] , AC_TRY_COMPILE([ +#undef __USE_MISC +#define __USE_MISC #include int getservent_r (struct servent *, char *, size_t, struct servent **); @@ -2114,6 +2167,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include void endservent_r(void); ] @@ -2140,6 +2195,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include void setservent_r(int); ]