ChangeLogTag: Tue Sep 21 20:13:40 2004 J.T. Conklin <jtc@acorntoolworks.com>

6 files changed, 34 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 3831cba22fb..1248e6b9865 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Tue Sep 21 20:13:40 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* configure.ac:
+
+	  Added checks for getipnodebyaddr() and getipnodebyname() which
+	  set ACE_LACKS_GETIPNODEBYADDR and ACE_LACKS_GETIPNODEBYNAME.
+
+	* ace/OS_NS_netdb.inl:
+
+	  Changed __GNUC__'s in conditionals to ACE_LACKS_GETIPNODEBYADDR
+	  or ACE_LACKS_GETIPNODEBYNAME.
+
+	* ace/config-linux-common.h:
+	* ace/config-netbsd.h:
+
+	  Added #define for ACE_LACKS_GETIPNODEBYADDR and
+	  ACE_LACKS_GETIPNODEBYNAME.
+
 Tue Sep 21 17:50:27 2004  Steve Huston  <shuston@riverace.com>
 
 	* examples/APG/Naming/naming.mpc: Correct the exename for Nodelocal.
diff --git a/ace/OS_NS_netdb.inl b/ace/OS_NS_netdb.inl
index 555521fb74c..fed8aa4ebbb 100644
--- a/ace/OS_NS_netdb.inl
+++ b/ace/OS_NS_netdb.inl
@@ -246,7 +246,7 @@ ACE_INLINE struct hostent *
 ACE_OS::getipnodebyaddr (const void *src, size_t len, int family)
 {
 #if defined (ACE_HAS_IPV6) && !defined (ACE_WIN32)
-#  if defined (__GLIBC__)
+#  if defined (ACE_LACKS_GETIPNODEBYADDR)
   ACE_UNUSED_ARG (src);
   ACE_UNUSED_ARG (len);
   ACE_UNUSED_ARG (family);
@@ -259,7 +259,7 @@ ACE_OS::getipnodebyaddr (const void *src, size_t len, int family)
       errno = errnum;
     }
   return hptr;
-#  endif /* whatever_doesnt_have_getipnodebyname */
+#  endif /* ACE_LACKS_GETIPNODEBYADDR */
 #else
   // IPv4-only implementation
   if (family == AF_INET)
@@ -281,7 +281,7 @@ ACE_OS::getipnodebyname (const char *name, int family, int flags)
   ACE_UNUSED_ARG (flags);
   ACE_NOTSUP_RETURN (0);
 # elif defined (ACE_HAS_IPV6) && !defined (ACE_WIN32)
-#   if defined (__GLIBC__)
+#   if defined (ACE_LACKS_GETIPNODEBYNAME)
   ACE_UNUSED_ARG (flags);
 #     if defined (ACE_HAS_NONCONST_GETBY)
   ACE_SOCKCALL_RETURN (::gethostbyname2 (const_cast<char *> (name),
@@ -299,7 +299,7 @@ ACE_OS::getipnodebyname (const char *name, int family, int flags)
       errno = errnum;
     }
   return hptr;
-#   endif /* __GLIBC__ */
+#   endif /* ACE_LACKS_GETIPNODEBYNAME */
 # else
   // IPv4-only implementation
   ACE_UNUSED_ARG (flags);
diff --git a/ace/README b/ace/README
index 0e1394d90c0..bcc5f927a10 100644
--- a/ace/README
+++ b/ace/README
@@ -765,6 +765,8 @@ ACE_LACKS_GETPGID                       Platform lacks getpgid() call
 ACE_LACKS_GETSERVBYNAME                 Platforms lacks
                                         getservbyname() (e.g., VxWorks
                                         and Chorus).
+ACE_LACKS_GETIPNODEBYADDR		Platform lacks getipnodebyaddr().
+ACE_LACKS_GETIPNODEBYNAME		Platform lacks getipnodebyname().
 ACE_LACKS_INET_ATON                     Platform lacks the inet_aton()
                                         function.
 ACE_LACKS_INET_ATON_PROTOTYPE           Platform/compiler lacks the
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index 3be0898f3a5..604afbb7fea 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -335,9 +335,12 @@
 
 #define ACE_SIZEOF_WCHAR 4
 
-#include /**/ "ace/post.h"
+#define ACE_LACKS_GETIPNODEBYADDR
+#define ACE_LACKS_GETIPNODEBYNAME
 
 // Enables use of POSIX termios struct
 #define ACE_USES_NEW_TERMIOS
 
+#include /**/ "ace/post.h"
+
 #endif /* ACE_LINUX_COMMON_H */
diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h
index 3e2b76af37e..9e7b7090369 100644
--- a/ace/config-netbsd.h
+++ b/ace/config-netbsd.h
@@ -87,6 +87,8 @@
 #define ACE_IOCTL_TYPE_ARG2 u_long
 #define ACE_LACKS_CONDATTR_PSHARED 1
 #define ACE_LACKS_GETHOSTENT 1
+#define ACE_LACKS_GETIPNODEBYADDR 1
+#define ACE_LACKS_GETIPNODEBYNAME 1
 #define ACE_LACKS_IOSTREAM_FX 1
 #define ACE_LACKS_ITOW 1
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
diff --git a/configure.ac b/configure.ac
index a6b69ea6be6..2a8b3dd57f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3188,6 +3188,10 @@ ACE_CHECK_LACKS_FUNCS(fgetwc fcntl fsync)
 
 ACE_CHECK_LACKS_FUNCS(gethostent)
 
+ACE_CHECK_LACKS_FUNCS(getipnodebyaddr)
+
+ACE_CHECK_LACKS_FUNCS(getipnodebyname)
+
 ACE_CHECK_HAS_FUNCS(getifaddrs)
 
 ACE_CHECK_HAS_FUNCS(itoa)