diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2007-11-17 14:11:53 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2007-11-17 14:11:53 +0000 |
| commit | a0f06d0dd52fe25593c3d18786dc237e58950bb7 (patch) | |
| tree | 7e317730a0c94e6d6b4c04aca0a04ca5fc30d7ca /main | |
| parent | 616189c6ec5cd2c4124b39f307af300b41d1afbd (diff) | |
start using asterisk/network.h for network related headers.
Also remove some unnecessary includes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89380 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/acl.c | 7 | ||||
| -rw-r--r-- | main/asterisk.c | 5 | ||||
| -rw-r--r-- | main/manager.c | 5 | ||||
| -rw-r--r-- | main/netsock.c | 7 | ||||
| -rw-r--r-- | main/utils.c | 6 |
5 files changed, 3 insertions, 27 deletions
diff --git a/main/acl.c b/main/acl.c index f82a0805c..03a01e739 100644 --- a/main/acl.c +++ b/main/acl.c @@ -30,13 +30,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/time.h> #include <signal.h> #include <errno.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <sys/socket.h> -#include <netdb.h> -#include <net/if.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> #include <sys/ioctl.h> #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) diff --git a/main/asterisk.c b/main/asterisk.c index 3db9c0ca5..905fb2f45 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -67,7 +67,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <fcntl.h> #include <signal.h> #include <sched.h> -#include <sys/socket.h> #include <sys/un.h> #include <sys/wait.h> #include <errno.h> @@ -87,14 +86,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #endif /* linux */ #include <regex.h> -#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 +#include "asterisk/network.h" #include "asterisk/logger.h" #include "asterisk/options.h" #include "asterisk/cli.h" diff --git a/main/manager.c b/main/manager.c index 7708d324f..9edc02ad1 100644 --- a/main/manager.c +++ b/main/manager.c @@ -47,11 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <ctype.h> #include <sys/time.h> -#include <netdb.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <netinet/tcp.h> -#include <arpa/inet.h> #include <signal.h> #include <errno.h> #include <sys/mman.h> diff --git a/main/netsock.c b/main/netsock.c index b391fc4ee..6cd5e090f 100644 --- a/main/netsock.c +++ b/main/netsock.c @@ -32,13 +32,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <sys/time.h> #include <signal.h> #include <errno.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <sys/socket.h> -#include <netdb.h> -#include <net/if.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> #include <sys/ioctl.h> #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) diff --git a/main/utils.c b/main/utils.c index 586e1ccc7..ebec01e38 100644 --- a/main/utils.c +++ b/main/utils.c @@ -30,15 +30,13 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <ctype.h> #include <errno.h> #include <sys/stat.h> -#include <sys/socket.h> -#include <netdb.h> -#include <netinet/in.h> -#include <arpa/inet.h> #ifdef HAVE_DEV_URANDOM #include <fcntl.h> #endif +#include "asterisk/network.h" + #define AST_API_MODULE /* ensure that inlinable API functions will be built in lock.h if required */ #include "asterisk/lock.h" #include "asterisk/io.h" |