diff options
-rwxr-xr-x | channels/chan_agent.c | 3 | ||||
-rwxr-xr-x | channels/chan_features.c | 3 | ||||
-rwxr-xr-x | channels/chan_local.c | 3 | ||||
-rwxr-xr-x | channels/chan_mgcp.c | 5 | ||||
-rwxr-xr-x | channels/chan_modem.c | 6 | ||||
-rwxr-xr-x | channels/chan_sip.c | 5 | ||||
-rwxr-xr-x | channels/chan_skinny.c | 2 | ||||
-rwxr-xr-x | formats/format_g723.c | 3 | ||||
-rwxr-xr-x | formats/format_g726.c | 2 | ||||
-rwxr-xr-x | formats/format_g729.c | 2 | ||||
-rwxr-xr-x | formats/format_gsm.c | 2 | ||||
-rwxr-xr-x | formats/format_h263.c | 2 | ||||
-rwxr-xr-x | formats/format_ilbc.c | 2 | ||||
-rwxr-xr-x | formats/format_pcm.c | 2 | ||||
-rwxr-xr-x | formats/format_pcm_alaw.c | 2 | ||||
-rwxr-xr-x | formats/format_sln.c | 2 | ||||
-rwxr-xr-x | formats/format_vox.c | 2 | ||||
-rwxr-xr-x | formats/format_wav.c | 2 | ||||
-rwxr-xr-x | formats/format_wav_gsm.c | 2 | ||||
-rwxr-xr-x | include/asterisk/utils.h | 1 | ||||
-rwxr-xr-x | pbx/pbx_dundi.c | 2 |
21 files changed, 31 insertions, 24 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 10fec951f..a2d721d1e 100755 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -13,12 +13,13 @@ #include <stdio.h> #include <string.h> -#include <sys/socket.h> #include <errno.h> #include <unistd.h> +#include <sys/socket.h> #include <stdlib.h> #include <fcntl.h> #include <netdb.h> +#include <netinet/in.h> #include <arpa/inet.h> #include <sys/signal.h> diff --git a/channels/chan_features.c b/channels/chan_features.c index f7505d30b..18f7367cf 100755 --- a/channels/chan_features.c +++ b/channels/chan_features.c @@ -13,12 +13,13 @@ #include <stdio.h> #include <string.h> +#include <unistd.h> #include <sys/socket.h> #include <errno.h> -#include <unistd.h> #include <stdlib.h> #include <fcntl.h> #include <netdb.h> +#include <netinet/in.h> #include <arpa/inet.h> #include <sys/signal.h> diff --git a/channels/chan_local.c b/channels/chan_local.c index 8804b6a53..e520edaed 100755 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -13,12 +13,13 @@ #include <stdio.h> #include <string.h> +#include <unistd.h> #include <sys/socket.h> #include <errno.h> -#include <unistd.h> #include <stdlib.h> #include <fcntl.h> #include <netdb.h> +#include <netinet/in.h> #include <arpa/inet.h> #include <sys/signal.h> diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 6382b8bb5..f2b03fb80 100755 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -55,19 +55,20 @@ #include <stdio.h> #include <string.h> +#include <unistd.h> #include <sys/socket.h> #include <sys/ioctl.h> #include <net/if.h> #include <errno.h> -#include <unistd.h> #include <stdlib.h> #include <fcntl.h> #include <netdb.h> -#include <arpa/inet.h> #include <sys/signal.h> #include <signal.h> +#include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> +#include <arpa/inet.h> #include <ctype.h> #include "asterisk.h" diff --git a/channels/chan_modem.c b/channels/chan_modem.c index 0b2e10d09..25a052f6b 100755 --- a/channels/chan_modem.c +++ b/channels/chan_modem.c @@ -13,18 +13,18 @@ #include <stdio.h> #include <string.h> +#include <ctype.h> +#include <stdlib.h> +#include <unistd.h> #include <sys/socket.h> #include <sys/time.h> #include <errno.h> -#include <unistd.h> -#include <stdlib.h> #include <netinet/in.h> #include <arpa/inet.h> #include <fcntl.h> #include <sys/ioctl.h> #include <sys/termios.h> #include <sys/signal.h> -#include <ctype.h> #include "asterisk.h" diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d99ac9535..84b23b1ff 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -15,18 +15,19 @@ #include <stdio.h> #include <ctype.h> #include <string.h> +#include <unistd.h> #include <sys/socket.h> #include <sys/ioctl.h> #include <net/if.h> #include <errno.h> -#include <unistd.h> #include <stdlib.h> #include <fcntl.h> #include <netdb.h> -#include <arpa/inet.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> diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index f70d61dc3..d5c2f939e 100755 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -16,13 +16,13 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include <sys/socket.h> #include <netinet/in.h> #include <netinet/tcp.h> #include <sys/ioctl.h> #include <net/if.h> #include <errno.h> -#include <unistd.h> #include <fcntl.h> #include <netdb.h> #include <arpa/inet.h> diff --git a/formats/format_g723.c b/formats/format_g723.c index 9a8430184..d0e1b2325 100755 --- a/formats/format_g723.c +++ b/formats/format_g723.c @@ -11,10 +11,11 @@ * the GNU General Public License */ +#include <unistd.h> +#include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <string.h> #include <sys/time.h> diff --git a/formats/format_g726.c b/formats/format_g726.c index 8e3c8b3c3..4813a72c0 100755 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -9,12 +9,12 @@ * the GNU General Public License */ +#include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> #include <sys/time.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <string.h> diff --git a/formats/format_g729.c b/formats/format_g729.c index bb25f190f..19e6809be 100755 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -11,12 +11,12 @@ * the GNU General Public License */ +#include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> #include <sys/time.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <string.h> diff --git a/formats/format_gsm.c b/formats/format_gsm.c index 381733ada..01fb2a1f9 100755 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -11,12 +11,12 @@ * the GNU General Public License */ +#include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> #include <sys/time.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <string.h> diff --git a/formats/format_h263.c b/formats/format_h263.c index 518ccf6ab..990acbecc 100755 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -11,12 +11,12 @@ * the GNU General Public License */ +#include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> #include <sys/time.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <string.h> diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c index 47a437c97..a690f2690 100755 --- a/formats/format_ilbc.c +++ b/formats/format_ilbc.c @@ -13,12 +13,12 @@ * the GNU General Public License */ +#include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> #include <sys/time.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <string.h> diff --git a/formats/format_pcm.c b/formats/format_pcm.c index d3b8a04fb..5c28fe3d1 100755 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -11,12 +11,12 @@ * the GNU General Public License */ +#include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> #include <sys/time.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <string.h> diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c index f53deb487..b5de9f980 100755 --- a/formats/format_pcm_alaw.c +++ b/formats/format_pcm_alaw.c @@ -11,6 +11,7 @@ * the GNU General Public License */ +#include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -18,7 +19,6 @@ #include <sys/times.h> #include <sys/types.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <string.h> diff --git a/formats/format_sln.c b/formats/format_sln.c index 911163de9..3d051c1c1 100755 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -9,12 +9,12 @@ * the GNU General Public License */ +#include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> #include <sys/time.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <string.h> diff --git a/formats/format_vox.c b/formats/format_vox.c index 659281ea1..e8f9218ea 100755 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -11,12 +11,12 @@ * the GNU General Public License */ +#include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> #include <sys/time.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <string.h> diff --git a/formats/format_wav.c b/formats/format_wav.c index 3e8117c3f..6e9246754 100755 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -11,12 +11,12 @@ * the GNU General Public License */ +#include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> #include <sys/time.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <string.h> diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index 441cb5d60..866c5f54c 100755 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -11,12 +11,12 @@ * the GNU General Public License */ +#include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> #include <sys/time.h> #include <stdio.h> -#include <unistd.h> #include <errno.h> #include <string.h> diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h index 443908578..5b2001a6d 100755 --- a/include/asterisk/utils.h +++ b/include/asterisk/utils.h @@ -17,6 +17,7 @@ #endif #include <netinet/in.h> +#include <arpa/inet.h> /* we want to override inet_ntoa */ #include <netdb.h> #include <pthread.h> #include <limits.h> diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 36149f39c..aa58d5556 100755 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -11,8 +11,8 @@ #include <stdlib.h> #include <unistd.h> -#include <arpa/inet.h> #include <netinet/in.h> +#include <arpa/inet.h> #include <sys/socket.h> #include <string.h> #include <errno.h> |