header ordering fixes for FreeBSD (pending a global merge into asterisk.h) (bug ...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5876 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 10fec95..a2d721d 100755 (executable)
--- 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 f7505d3..18f7367 100755 (executable)
--- 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 8804b6a..e520eda 100755 (executable)
--- 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 6382b8b..f2b03fb 100755 (executable)
--- 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 0b2e10d..25a052f 100755 (executable)
--- 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 d99ac95..84b23b1 100755 (executable)
--- 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 f70d61d..d5c2f93 100755 (executable)
--- 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 9a84301..d0e1b23 100755 (executable)
--- 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 8e3c8b3..4813a72 100755 (executable)
--- 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 bb25f19..19e6809 100755 (executable)
--- 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 381733a..01fb2a1 100755 (executable)
--- 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 518ccf6..990acbe 100755 (executable)
--- 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 47a437c..a690f26 100755 (executable)
--- 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 d3b8a04..5c28fe3 100755 (executable)
--- 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 f53deb4..b5de9f9 100755 (executable)
--- 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 911163d..3d051c1 100755 (executable)
--- 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 659281e..e8f9218 100755 (executable)
--- 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 3e8117c..6e92467 100755 (executable)
--- 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 441cb5d..866c5f5 100755 (executable)
--- 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 4439085..5b2001a 100755 (executable)
--- 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 36149f3..aa58d55 100755 (executable)
--- 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>