Move #defined for getaddrinfo into network.h (as other

defines). Allows RHEL4 compile to work.
Jeremy.

diff --git a/source/lib/replace/getaddrinfo.h b/source/lib/replace/getaddrinfo.h
index 3e1fea8c4c5c40d8468155570cfb994e38fbc6a6..47a62eb8b22f25322465e491ab77a78f1b3b2632 100644 (file)
--- a/source/lib/replace/getaddrinfo.h
+++ b/source/lib/replace/getaddrinfo.h
@@ -47,86 +47,6 @@ TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #ifndef GETADDRINFO_H
 #define GETADDRINFO_H
 
-
-/* Various macros that ought to be in <netdb.h>, but might not be */
-
-#ifndef EAI_FAIL
-#define EAI_BADFLAGS   (-1)
-#define EAI_NONAME             (-2)
-#define EAI_AGAIN              (-3)
-#define EAI_FAIL               (-4)
-#define EAI_FAMILY             (-6)
-#define EAI_SOCKTYPE   (-7)
-#define EAI_SERVICE            (-8)
-#define EAI_MEMORY             (-10)
-#define EAI_SYSTEM             (-11)
-#endif   /* !EAI_FAIL */
-
-#ifndef AI_PASSIVE
-#define AI_PASSIVE             0x0001
-#endif
-
-#ifndef AI_NUMERICHOST
-/*
- * some platforms don't support AI_NUMERICHOST; define as zero if using
- * the system version of getaddrinfo...
- */
-#if defined(HAVE_STRUCT_ADDRINFO) && defined(HAVE_GETADDRINFO)
-#define AI_NUMERICHOST 0
-#else
-#define AI_NUMERICHOST 0x0004
-#endif
-#endif
-
-#ifndef AI_ADDRCONFIG
-#define AI_ADDRCONFIG  0x0020
-#endif
-
-#ifndef NI_NUMERICHOST
-#define NI_NUMERICHOST 1
-#endif
-
-#ifndef NI_NUMERICSERV
-#define NI_NUMERICSERV 2
-#endif
-
-#ifndef NI_NOFQDN
-#define NI_NOFQDN      4
-#endif
-
-#ifndef NI_NAMEREQD
-#define NI_NAMEREQD    8
-#endif
-
-#ifndef NI_DGRAM
-#define NI_DGRAM       16
-#endif
-
-
-#ifndef NI_MAXHOST
-#define NI_MAXHOST     1025
-#endif
-
-#ifndef NI_MAXSERV
-#define NI_MAXSERV     32
-#endif
-
-#ifndef HAVE_STRUCT_ADDRINFO
-
-struct addrinfo
-{
-       int                     ai_flags;
-       int                     ai_family;
-       int                     ai_socktype;
-       int                     ai_protocol;
-       size_t          ai_addrlen;
-       struct sockaddr *ai_addr;
-       char       *ai_canonname;
-       struct addrinfo *ai_next;
-};
-#endif   /* HAVE_STRUCT_ADDRINFO */
-
-
 #ifndef HAVE_GETADDRINFO
 
 /* Rename private copies per comments above */

diff --git a/source/lib/replace/system/network.h b/source/lib/replace/system/network.h
index 0b0dbcb88d69c3cea0906d7fb740bf2a1bbb2806..61de2b728d1e276e2e3c7cf042f756756f97c248 100644 (file)
--- a/source/lib/replace/system/network.h
+++ b/source/lib/replace/system/network.h
@@ -49,10 +49,6 @@
 #include <netinet/tcp.h>
 #endif
 
-#if !defined(HAVE_GETADDRINFO)
-#include "getaddrinfo.h"
-#endif
-
 /*
  * The next three defines are needed to access the IPTOS_* options
  * on some systems.
@@ -104,6 +100,97 @@ int rep_inet_pton(int af, const char *src, void *dst);
 const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size);
 #endif
 
+#if !defined(HAVE_GETADDRINFO)
+#include "getaddrinfo.h"
+#endif
+
+/*
+ * Some systems have getaddrinfo but not the
+ * defines needed to use it.
+ */
+
+/* Various macros that ought to be in <netdb.h>, but might not be */
+
+#ifndef EAI_FAIL
+#define EAI_BADFLAGS   (-1)
+#define EAI_NONAME     (-2)
+#define EAI_AGAIN      (-3)
+#define EAI_FAIL       (-4)
+#define EAI_FAMILY     (-6)
+#define EAI_SOCKTYPE   (-7)
+#define EAI_SERVICE    (-8)
+#define EAI_MEMORY     (-10)
+#define EAI_SYSTEM     (-11)
+#endif   /* !EAI_FAIL */
+
+#ifndef AI_PASSIVE
+#define AI_PASSIVE     0x0001
+#endif
+
+#ifndef AI_CANONNAME
+#define AI_CANONNAME   0x0002
+#endif
+
+#ifndef AI_NUMERICHOST
+/*
+ * some platforms don't support AI_NUMERICHOST; define as zero if using
+ * the system version of getaddrinfo...
+ */
+#if defined(HAVE_STRUCT_ADDRINFO) && defined(HAVE_GETADDRINFO)
+#define AI_NUMERICHOST 0
+#else
+#define AI_NUMERICHOST 0x0004
+#endif
+#endif
+
+#ifndef AI_ADDRCONFIG
+#define AI_ADDRCONFIG  0x0020
+#endif
+
+#ifndef NI_NUMERICHOST
+#define NI_NUMERICHOST 1
+#endif
+
+#ifndef NI_NUMERICSERV
+#define NI_NUMERICSERV 2
+#endif
+
+#ifndef NI_NOFQDN
+#define NI_NOFQDN      4
+#endif
+
+#ifndef NI_NAMEREQD
+#define NI_NAMEREQD    8
+#endif
+
+#ifndef NI_DGRAM
+#define NI_DGRAM       16
+#endif
+
+
+#ifndef NI_MAXHOST
+#define NI_MAXHOST     1025
+#endif
+
+#ifndef NI_MAXSERV
+#define NI_MAXSERV     32
+#endif
+
+#ifndef HAVE_STRUCT_ADDRINFO
+
+struct addrinfo
+{
+       int                     ai_flags;
+       int                     ai_family;
+       int                     ai_socktype;
+       int                     ai_protocol;
+       size_t          ai_addrlen;
+       struct sockaddr *ai_addr;
+       char       *ai_canonname;
+       struct addrinfo *ai_next;
+};
+#endif   /* HAVE_STRUCT_ADDRINFO */
+
 /*
  * glibc on linux doesn't seem to have MSG_WAITALL
  * defined. I think the kernel has it though..