NetBSD portability enhancements (bug #969)

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

diff --git a/channels/chan_iax.c b/channels/chan_iax.c
index 1df5e8af478a24253e78d39154c6ee3468e9cd8f..fc6ef0ff503a1fd99b41f7c237081e021d23cbd0 100755 (executable)
--- a/channels/chan_iax.c
+++ b/channels/chan_iax.c
@@ -35,7 +35,6 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <sys/time.h>
-#include <sys/signal.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -43,6 +42,9 @@
 #include <unistd.h>
 #include <netdb.h>
 #include <fcntl.h>
+#include <pthread.h>
+#include <signal.h>
+#include <sys/signal.h>
 
 #ifdef MYSQL_FRIENDS
 #include <mysql/mysql.h>

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 9d8ba48e25196a45e5517040dafdd25c926c30bf..36a7045b94f37cbb11936714ecfeefccf9d72c62 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -40,6 +40,8 @@
 #include <netinet/ip.h>
 #include <sys/time.h>
 #include <sys/signal.h>
+#include <signal.h>
+#include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 901f4132c3b865b5d8029fe1c58284361ab49499..d4131c656c4828aa2046a9d60cb480d6bd7d6369 100755 (executable)
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -45,6 +45,8 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <sys/signal.h>
+#include <signal.h>
+#include <pthread.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 37bb0894e56c2802302a3d880fc6c69bfd214fe1..b2b61ae96118e27da50eefb26cbf97475b29e04f 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -48,6 +48,8 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <arpa/inet.h>
+#include <pthread.h>
+#include <signal.h>
 #include <sys/signal.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
@@ -6792,7 +6794,7 @@ int unload_module()
                return -1;
        }
        if (!ast_mutex_lock(&monlock)) {
-               if (monitor_thread && (monitor_thread != -2)) {
+               if (monitor_thread && ((int)monitor_thread != -2)) {
                        pthread_cancel(monitor_thread);
                        pthread_kill(monitor_thread, SIGURG);
                        pthread_join(monitor_thread, NULL);

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 880ff69bba996752d3f623a38ab9b8e84614b2f5..b396605b4a2dd46902759fdafb496a34ad47eadb 100755 (executable)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -49,6 +49,8 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <sys/signal.h>
+#include <signal.h>
+#include <pthread.h>
 #include <asterisk/dsp.h>
 #include <ctype.h>