ng_ipaddr.h must include netinet/in.h.

compile on FreeBSD 5.4 failed with:
./../ipaddr/ng_ipaddr.h:34: error: field `sin4' has incomplete type

Reported and tested by Jefferson S Almeida.

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 32839d083a8ab1e7328864ee2e376805ac890e6e..7894af25fbebefdb22f24adac1afe9a9dcb639b6 100644 (file)
--- a/src/ipaddr/ng_ipaddr.h
+++ b/src/ipaddr/ng_ipaddr.h
@@ -9,6 +9,7 @@
 #include "portab.h"
 
 #include <sys/socket.h>
+#include <netinet/in.h>
 
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
@@ -115,3 +116,4 @@ ng_ipaddr_tostr_r(const ng_ipaddr_t *addr, char *d)
 #endif
 
 /* -eof- */
+

diff --git a/src/ngircd/resolve.h b/src/ngircd/resolve.h
index 9fd16bee645bebac9980732cccc76d9e92a3906b..8ff88c8b128ff8398b374c2f5dd78403818aece5 100644 (file)
--- a/src/ngircd/resolve.h
+++ b/src/ngircd/resolve.h
@@ -20,7 +20,6 @@
 #include "array.h"
 #include "tool.h"
 #include "ng_ipaddr.h"
-#include <netinet/in.h>
 
 /* This struct must not be accessed directly */
 typedef struct _Res_Stat {