diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2007-11-16 20:28:19 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2007-11-16 20:28:19 +0000 |
| commit | 04497db215698eaef1add4d8d3c69f7fae488665 (patch) | |
| tree | 21c0054559e3572b064a07cfb3a035133acf7592 | |
| parent | 2a61f4bfd5b789d788ac9173ba353600041dcb86 (diff) | |
remove duplicate headers.
Properly check for netdb.h (there is actually tens of places to fix)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89335 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | main/acl.c | 2 | ||||
| -rw-r--r-- | main/asterisk.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/main/acl.c b/main/acl.c index d803290e6..f82a0805c 100644 --- a/main/acl.c +++ b/main/acl.c @@ -30,13 +30,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #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> diff --git a/main/asterisk.c b/main/asterisk.c index a94972cc5..1f03484d2 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -70,7 +70,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #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,13 +87,13 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #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" #include "asterisk/options.h" |