[svn-commits] rizzo: trunk r89382 - in /trunk: channels/ main/

[SVN commits to the Digium repositories]

Author: rizzo
Date: Sat Nov 17 08:45:46 2007
New Revision: 89382

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89382
Log:
fix breakage induced by previous mistake

Modified:
    trunk/channels/chan_sip.c
    trunk/main/acl.c
    trunk/main/dns.c
    trunk/main/dnsmgr.c
    trunk/main/netsock.c
    trunk/main/rtp.c
    trunk/main/udptl.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=89382&r1=89381&r2=89382
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Sat Nov 17 08:45:46 2007
@@ -88,19 +88,14 @@
 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"

Modified: trunk/main/acl.c
URL: http://svn.digium.com/view/asterisk/trunk/main/acl.c?view=diff&rev=89382&r1=89381&r2=89382
==============================================================================
--- trunk/main/acl.c (original)
+++ trunk/main/acl.c Sat Nov 17 08:45:46 2007
@@ -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>

Modified: trunk/main/dns.c
URL: http://svn.digium.com/view/asterisk/trunk/main/dns.c?view=diff&rev=89382&r1=89381&r2=89382
==============================================================================
--- trunk/main/dns.c (original)
+++ trunk/main/dns.c Sat Nov 17 08:45:46 2007
@@ -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"

Modified: trunk/main/dnsmgr.c
URL: http://svn.digium.com/view/asterisk/trunk/main/dnsmgr.c?view=diff&rev=89382&r1=89381&r2=89382
==============================================================================
--- trunk/main/dnsmgr.c (original)
+++ trunk/main/dnsmgr.c Sat Nov 17 08:45:46 2007
@@ -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>
 

Modified: trunk/main/netsock.c
URL: http://svn.digium.com/view/asterisk/trunk/main/netsock.c?view=diff&rev=89382&r1=89381&r2=89382
==============================================================================
--- trunk/main/netsock.c (original)
+++ trunk/main/netsock.c Sat Nov 17 08:45:46 2007
@@ -36,7 +36,6 @@
 
 #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
 #include <fcntl.h>
-#include <net/route.h>
 #endif
 
 #if defined (SOLARIS)

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=89382&r1=89381&r2=89382
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Sat Nov 17 08:45:46 2007
@@ -33,9 +33,6 @@
 #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"

Modified: trunk/main/udptl.c
URL: http://svn.digium.com/view/asterisk/trunk/main/udptl.c?view=diff&rev=89382&r1=89381&r2=89382
==============================================================================
--- trunk/main/udptl.c (original)
+++ trunk/main/udptl.c Sat Nov 17 08:45:46 2007
@@ -53,9 +53,6 @@
 #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"