summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorLuigi Rizzo <rizzo@icir.org>2007-11-17 14:45:46 +0000
committerLuigi Rizzo <rizzo@icir.org>2007-11-17 14:45:46 +0000
commit5663ff65185bd844e02c31bb2dcf2c0364e35a8f (patch)
tree3fd4e866dd6788d55eaef2e34b1ae7092299cac1 /main
parent59692c5e94a00a2561bb2876f67d4ab70bafdc5c (diff)
fix breakage induced by previous mistake
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89382 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/acl.c6
-rw-r--r--main/dns.c5
-rw-r--r--main/dnsmgr.c4
-rw-r--r--main/netsock.c1
-rw-r--r--main/rtp.c3
-rw-r--r--main/udptl.c3
6 files changed, 8 insertions, 14 deletions
diff --git a/main/acl.c b/main/acl.c
index 03a01e739..a68b0ede4 100644
--- a/main/acl.c
+++ b/main/acl.c
@@ -27,11 +27,17 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include "asterisk/network.h"
+
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
#include <sys/ioctl.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
#include <fcntl.h>
#include <net/route.h>
diff --git a/main/dns.c b/main/dns.c
index a325796c0..229122ac4 100644
--- a/main/dns.c
+++ b/main/dns.c
@@ -33,9 +33,8 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
+#include "asterisk/network.h"
+#include <arpa/nameser.h> /* res_* functions */
#include <resolv.h>
#include "asterisk/logger.h"
diff --git a/main/dnsmgr.c b/main/dnsmgr.c
index 34dc2ebc6..acf618fac 100644
--- a/main/dnsmgr.c
+++ b/main/dnsmgr.c
@@ -27,10 +27,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <resolv.h>
#include <regex.h>
#include <signal.h>
diff --git a/main/netsock.c b/main/netsock.c
index 6cd5e090f..5eedb324f 100644
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -36,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
#include <fcntl.h>
-#include <net/route.h>
#endif
#if defined (SOLARIS)
diff --git a/main/rtp.c b/main/rtp.c
index 285d67182..03765eb61 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -33,9 +33,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
#include <fcntl.h>
#include "asterisk/rtp.h"
diff --git a/main/udptl.c b/main/udptl.c
index 9ac5aff5b..33671802d 100644
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -53,9 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <sys/time.h>
#include <signal.h>
#include <errno.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
#include <fcntl.h>
#include "asterisk/udptl.h"