Fix complie on FreeBSD 5.4 and AIX.

This is picked from commits

d9c26f3aeb35e979b72f7b0ac4220dbd07d7bc15
"ng_ipaddr.h must include netinet/in.h."

and
4e507881f30c8b4296d87de519658e45f8cb417f
"On AIX (for example) socklen_t is defined in sys/socket.h"

diff --git a/src/ipaddr/ng_ipaddr.c b/src/ipaddr/ng_ipaddr.c
index bbfb5a73741f3eab1d0eb69ec31a406770322eed..3b0595d79719b92b13edfd0f4a5422311f1ff550 100644 (file)
--- a/src/ipaddr/ng_ipaddr.c
+++ b/src/ipaddr/ng_ipaddr.c
@@ -14,9 +14,6 @@
 #include <netdb.h>
 #include <sys/types.h>
 #endif
-#include <sys/socket.h>
-
-#include <netinet/in.h>
 
 #include "ng_ipaddr.h"
 

diff --git a/src/ipaddr/ng_ipaddr.h b/src/ipaddr/ng_ipaddr.h
index 1e198b0e7ce41d49e0d18f8f0189e8a9dc1390c3..3bc075e6434dc0be9792dbb843db0c6df38522c5 100644 (file)
--- a/src/ipaddr/ng_ipaddr.h
+++ b/src/ipaddr/ng_ipaddr.h
@@ -8,6 +8,9 @@
 #define NG_IPADDR_HDR
 #include "portab.h"
 
+#include <sys/socket.h>
+#include <netinet/in.h>
+
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #else