From: Florian Westphal <fw@strlen.de>
Date: Sat, 10 May 2008 19:53:39 +0000 (+0200)
Subject: Fix complie on FreeBSD 5.4 and AIX.
X-Git-Tag: rel-0-12-0~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc93044909597798ca416dacc312bdb9c792c6ed;p=ngircd

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 bbfb5a73..3b0595d7 100644
--- 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 1e198b0e..3bc075e6 100644
--- 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