From 8f80a80f4ecc82e77b74a3dc07e922be558df5d1 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 2 Oct 2006 01:18:51 +0000 Subject: [PATCH] 2086. [port] libbind: FreeBSD now has get*by*_r() functions. [RT #16403] --- CHANGES | 3 +++ lib/bind/include/netdb.h | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 124e11936a..e6c73abc93 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +2086. [port] libbind: FreeBSD now has get*by*_r() functions. + [RT #16403] + 2085. [doc] win32: added index.html and README to zip. [RT #16201] 2084. [contrib] dbus update for 9.3.3rc2. diff --git a/lib/bind/include/netdb.h b/lib/bind/include/netdb.h index 0a9bc1df7f..2d5bead35d 100644 --- a/lib/bind/include/netdb.h +++ b/lib/bind/include/netdb.h @@ -86,7 +86,7 @@ /* * @(#)netdb.h 8.1 (Berkeley) 6/2/93 - * $Id: netdb.h,v 1.12.2.9 2006/08/01 01:45:10 marka Exp $ + * $Id: netdb.h,v 1.12.2.10 2006/10/02 01:18:51 marka Exp $ */ #ifndef _NETDB_H_ @@ -493,7 +493,7 @@ int innetgr_r __P((const char *, const char *, const char *, #endif #else /* defined(sun) || defined(bsdi) */ -#ifdef __GLIBC__ +#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103) int gethostbyaddr_r __P((const char *, int, int, struct hostent *, char *, size_t, struct hostent **, int *)); int gethostbyname_r __P((const char *, struct hostent *, @@ -510,7 +510,7 @@ struct hostent *gethostent_r __P((struct hostent *, char *, int, int *)); void sethostent_r __P((int)); void endhostent_r __P((void)); -#ifdef __GLIBC__ +#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103) int getnetbyname_r __P((const char *, struct netent *, char *, size_t, struct netent **, int*)); int getnetbyaddr_r __P((unsigned long int, int, struct netent *, @@ -526,7 +526,7 @@ struct netent *getnetent_r __P((struct netent *, char *, int)); void setnetent_r __P((int)); void endnetent_r __P((void)); -#ifdef __GLIBC__ +#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103) int getprotobyname_r __P((const char *, struct protoent *, char *, size_t, struct protoent **)); int getprotobynumber_r __P((int, struct protoent *, char *, size_t, @@ -542,7 +542,7 @@ struct protoent *getprotoent_r __P((struct protoent *, char *, int)); void setprotoent_r __P((int)); void endprotoent_r __P((void)); -#ifdef __GLIBC__ +#if defined(__GLIBC__) || defined(__FreeBSD__) && (__FreeBSD_version + 0 >= 601103) int getservbyname_r __P((const char *name, const char *, struct servent *, char *, size_t, struct servent **)); int getservbyport_r __P((int port, const char *,