Merge "Fixes to include signal.h"

addons/chan_ooh323.h

@@ -38,7 +38,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <sys/signal.h>
 
 #include "asterisk/lock.h"
 #include "asterisk/channel.h"

apps/app_dahdiras.c

@@ -36,12 +36,7 @@ ASTERISK_REGISTER_FILE()
 
 #include <sys/ioctl.h>
 #include <sys/wait.h>
-#ifdef __linux__
-#include <sys/signal.h>
-#else
 #include <signal.h>
-#endif /* __linux__ */
-
 #include <fcntl.h>
 
 #include <dahdi/user.h>

apps/app_dial.c

@@ -35,7 +35,7 @@
 ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <sys/stat.h>
 #include <netinet/in.h>
 

apps/app_queue.c

@@ -72,7 +72,7 @@
 ASTERISK_REGISTER_FILE()
 
 #include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <netinet/in.h>
 #include <ctype.h>
 

channels/chan_console.c

@@ -64,7 +64,7 @@
 
 ASTERISK_REGISTER_FILE()
 
-#include <sys/signal.h>  /* SIGURG */
+#include <signal.h>  /* SIGURG */
 
 #include <portaudio.h>
 

channels/chan_dahdi.c

@@ -58,10 +58,8 @@ ASTERISK_REGISTER_FILE()
 
 #if defined(__NetBSD__) || defined(__FreeBSD__)
 #include <pthread.h>
-#include <signal.h>
-#else
-#include <sys/signal.h>
 #endif
+#include <signal.h>
 #include <sys/stat.h>
 #include <math.h>
 

channels/chan_iax2.c

@@ -68,7 +68,6 @@ ASTERISK_REGISTER_FILE()
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <sys/time.h>
-#include <sys/signal.h>
 #include <signal.h>
 #include <strings.h>
 #include <netdb.h>

channels/chan_mgcp.c

@@ -47,7 +47,6 @@ ASTERISK_REGISTER_FILE()
 #include <net/if.h>
 #include <fcntl.h>
 #include <netdb.h>
-#include <sys/signal.h>
 #include <signal.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

channels/chan_motif.c

@@ -51,7 +51,7 @@ ASTERISK_REGISTER_FILE()
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <iksemel.h>
 #include <pthread.h>
 

channels/chan_sip.c

@@ -224,7 +224,6 @@
 ASTERISK_REGISTER_FILE()
 
 #include <signal.h>
-#include <sys/signal.h>
 #include <regex.h>
 #include <inttypes.h>
 

channels/chan_skinny.c

@@ -49,7 +49,6 @@ ASTERISK_REGISTER_FILE()
 #include <fcntl.h>
 #include <netdb.h>
 #include <arpa/inet.h>
-#include <sys/signal.h>
 #include <signal.h>
 #include <ctype.h>
 

main/cli.c

@@ -42,7 +42,6 @@ ASTERISK_REGISTER_FILE()
 
 #include "asterisk/_private.h"
 #include "asterisk/paths.h"	/* use ast_config_AST_MODULE_DIR */
-#include <sys/signal.h>
 #include <signal.h>
 #include <ctype.h>
 #include <regex.h>

main/features.c

@@ -46,7 +46,7 @@ ASTERISK_REGISTER_FILE()
 #include <pthread.h>
 #include <signal.h>
 #include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <netinet/in.h>
 
 #include "asterisk/lock.h"

main/http.c

@@ -49,7 +49,7 @@ ASTERISK_REGISTER_FILE()
 #include <time.h>
 #include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <fcntl.h>
 
 #include "asterisk/paths.h"	/* use ast_config_AST_DATA_DIR */

main/tcptls.c

@@ -38,7 +38,6 @@ ASTERISK_REGISTER_FILE()
 #endif
 
 #include <signal.h>
-#include <sys/signal.h>
 
 #include "asterisk/compat.h"
 #include "asterisk/tcptls.h"

pbx/pbx_dundi.c

@@ -43,7 +43,7 @@ ASTERISK_REGISTER_FILE()
 #include "asterisk/network.h"
 #include <sys/ioctl.h>
 #include <zlib.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <pthread.h>
 #include <net/if.h>
 

res/res_musiconhold.c

@@ -44,7 +44,7 @@ ASTERISK_REGISTER_FILE()
 #include <ctype.h>
 #include <signal.h>
 #include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <netinet/in.h>
 #include <sys/stat.h>
 #include <dirent.h>