[svn-commits] rizzo: trunk r89335 - in /trunk/main: acl.c asterisk.c

[SVN commits to the Digium repositories]

Author: rizzo
Date: Fri Nov 16 14:28:19 2007
New Revision: 89335

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89335
Log:
remove duplicate headers.
Properly check for netdb.h (there is actually tens of places to fix)


Modified:
    trunk/main/acl.c
    trunk/main/asterisk.c

Modified: trunk/main/acl.c
URL: http://svn.digium.com/view/asterisk/trunk/main/acl.c?view=diff&rev=89335&r1=89334&r2=89335
==============================================================================
--- trunk/main/acl.c (original)
+++ trunk/main/acl.c Fri Nov 16 14:28:19 2007
@@ -30,13 +30,11 @@
 #include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
-#include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <net/if.h>
-#include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <sys/ioctl.h>

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=89335&r1=89334&r2=89335
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Fri Nov 16 14:28:19 2007
@@ -70,7 +70,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/wait.h>
-#include <string.h>
 #include <errno.h>
 #include <ctype.h>
 #include <sys/resource.h>
@@ -88,12 +87,12 @@
 #endif /* linux */
 #include <regex.h>
 
-#if  defined(__FreeBSD__) || defined( __NetBSD__ ) || defined(SOLARIS)
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
 #if defined(SOLARIS)
 int daemon(int, int);  /* defined in libresolv of all places */
 #include <sys/loadavg.h>
-#endif
 #endif
 
 #include "asterisk/logger.h"