fix breakage induced by previous mistake

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89382 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 71c8e6f7c77c28a1d3291a1ed3276456dc9f84a9..ead25948865b9e4e01cc46e886da08d93bf44d17 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -88,20 +88,15 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <ctype.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <net/if.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <netdb.h>
 #include <signal.h>
 #include <sys/signal.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <arpa/inet.h>
-#include <netinet/ip.h>
 #include <regex.h>
 
+#include "asterisk/network.h"
+
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"
 #include "asterisk/config.h"

diff --git a/main/acl.c b/main/acl.c
index 03a01e73964e245fdec7156c82aec5eca544d538..a68b0ede42c22fcf9c953185f279245e04351f37 100644 (file)
--- 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 a325796c0decc306248c77dd45576973b4c1dcd3..229122ac465787b6bffa14a0213baee98646b5f9 100644 (file)
--- 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 34dc2ebc65cc40a68ce195e4507a8a2d48c9fe93..acf618fac2a34000da6bb991255fc1b703f900be 100644 (file)
--- 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 6cd5e090f21f438d722a98a7a5636295e02e01ab..5eedb324f116636b2698eb2c914ee3c074b27819 100644 (file)
--- 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 285d67182319d91b9a04a56f6f08a538e2a9e642..03765eb6103f49a8fa45d60858600644658799e7 100644 (file)
--- 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 9ac5aff5b890161d74ab3d6d6e90f502f5e414a8..33671802d0bd7da7e47c15ea87e0e805c50b41d2 100644 (file)
--- 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"