diff options
Diffstat (limited to 'pbx')
-rwxr-xr-x | pbx/dundi-parser.c | 9 | ||||
-rwxr-xr-x | pbx/pbx_config.c | 17 | ||||
-rwxr-xr-x | pbx/pbx_dundi.c | 45 | ||||
-rwxr-xr-x | pbx/pbx_gtkconsole.c | 20 | ||||
-rwxr-xr-x | pbx/pbx_loopback.c | 14 | ||||
-rwxr-xr-x | pbx/pbx_realtime.c | 14 | ||||
-rwxr-xr-x | pbx/pbx_spool.c | 22 |
7 files changed, 84 insertions, 57 deletions
diff --git a/pbx/dundi-parser.c b/pbx/dundi-parser.c index 41d97d2ad..b29224d3c 100755 --- a/pbx/dundi-parser.c +++ b/pbx/dundi-parser.c @@ -13,12 +13,17 @@ #include <sys/socket.h> #include <string.h> #include <netinet/in.h> -#include "asterisk/frame.h" -#include "asterisk/utils.h" #include <arpa/inet.h> #include <unistd.h> #include <stdlib.h> #include <stdio.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include "asterisk/frame.h" +#include "asterisk/utils.h" #include "asterisk/dundi.h" #include "dundi-parser.h" #include "asterisk/dundi.h" diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 1e5bd49bd..69b66d5c2 100755 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -12,6 +12,16 @@ */ #include <sys/types.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <ctype.h> +#include <errno.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/pbx.h" #include "asterisk/config.h" #include "asterisk/options.h" @@ -19,13 +29,6 @@ #include "asterisk/logger.h" #include "asterisk/cli.h" #include "asterisk/callerid.h" -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <ctype.h> -#include <errno.h> -/* For where to put dynamic tables */ -#include "asterisk.h" #ifdef __AST_DEBUG_MALLOC static void FREE(void *ptr) diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index c5deb503c..36149f39c 100755 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -9,6 +9,31 @@ * of the GNU General Public License. */ +#include <stdlib.h> +#include <unistd.h> +#include <arpa/inet.h> +#include <netinet/in.h> +#include <sys/socket.h> +#include <string.h> +#include <errno.h> +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__Darwin__) +#include <sys/types.h> +#include <netinet/in_systm.h> +#endif +#include <netinet/ip.h> +#include <sys/ioctl.h> +#include <netinet/in.h> +#include <net/if.h> +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) +#include <net/if_dl.h> +#include <ifaddrs.h> +#endif +#include <zlib.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/file.h" #include "asterisk/logger.h" #include "asterisk/channel.h" @@ -31,26 +56,6 @@ #include "asterisk/aes.h" #include "dundi-parser.h" -#include <stdlib.h> -#include <unistd.h> -#include <arpa/inet.h> -#include <netinet/in.h> -#include <sys/socket.h> -#include <string.h> -#include <errno.h> -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__Darwin__) -#include <sys/types.h> -#include <netinet/in_systm.h> -#endif -#include <netinet/ip.h> -#include <sys/ioctl.h> -#include <netinet/in.h> -#include <net/if.h> -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) -#include <net/if_dl.h> -#include <ifaddrs.h> -#endif -#include <zlib.h> #define MAX_RESULTS 64 diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c index 9394b641c..62443d29e 100755 --- a/pbx/pbx_gtkconsole.c +++ b/pbx/pbx_gtkconsole.c @@ -20,13 +20,6 @@ */ #include <sys/types.h> -#include "asterisk/pbx.h" -#include "asterisk/config.h" -#include "asterisk/module.h" -#include "asterisk/logger.h" -#include "asterisk/options.h" -#include "asterisk/cli.h" -#include "asterisk/utils.h" #include <stdlib.h> #include <fcntl.h> #include <unistd.h> @@ -38,9 +31,18 @@ #include <gtk/gtk.h> #include <glib.h> -/* For where to put dynamic tables */ + #include "asterisk.h" -#include "astconf.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include "asterisk/pbx.h" +#include "asterisk/config.h" +#include "asterisk/module.h" +#include "asterisk/logger.h" +#include "asterisk/options.h" +#include "asterisk/cli.h" +#include "asterisk/utils.h" AST_MUTEX_DEFINE_STATIC(verb_lock); diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c index 065cac855..70159c79b 100755 --- a/pbx/pbx_loopback.c +++ b/pbx/pbx_loopback.c @@ -9,6 +9,15 @@ * of the GNU General Public License. */ +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/file.h" #include "asterisk/logger.h" #include "asterisk/channel.h" @@ -29,11 +38,6 @@ #include "asterisk/crypto.h" #include "asterisk/astdb.h" -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <errno.h> - static char *tdesc = "Loopback Switch"; /* Loopback switch substitutes ${EXTEN}, ${CONTEXT}, and ${PRIORITY} into diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c index 8574a6675..c2536b16a 100755 --- a/pbx/pbx_realtime.c +++ b/pbx/pbx_realtime.c @@ -9,6 +9,15 @@ * of the GNU General Public License. */ +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> + +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + #include "asterisk/file.h" #include "asterisk/logger.h" #include "asterisk/channel.h" @@ -31,11 +40,6 @@ #include "asterisk/crypto.h" #include "asterisk/astdb.h" -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <errno.h> - #define MODE_MATCH 0 #define MODE_MATCHMORE 1 #define MODE_CANMATCH 2 diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c index c30888dc4..1087cb4b0 100755 --- a/pbx/pbx_spool.c +++ b/pbx/pbx_spool.c @@ -11,15 +11,6 @@ * the GNU General Public License */ -#include "asterisk/lock.h" -#include "asterisk/file.h" -#include "asterisk/logger.h" -#include "asterisk/channel.h" -#include "asterisk/callerid.h" -#include "asterisk/pbx.h" -#include "asterisk/module.h" -#include "asterisk/options.h" -#include "asterisk/utils.h" #include <sys/stat.h> #include <errno.h> #include <time.h> @@ -31,8 +22,21 @@ #include <string.h> #include <stdio.h> #include <unistd.h> + #include "asterisk.h" +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include "asterisk/lock.h" +#include "asterisk/file.h" +#include "asterisk/logger.h" +#include "asterisk/channel.h" +#include "asterisk/callerid.h" +#include "asterisk/pbx.h" +#include "asterisk/module.h" +#include "asterisk/options.h" +#include "asterisk/utils.h" + /* * pbx_spool is similar in spirit to qcall, but with substantially enhanced functionality... * The spool file contains a header |