diff options
author | Timo Teräs <timo.teras@iki.fi> | 2016-06-03 08:57:02 +0300 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2016-06-08 20:37:08 +0300 |
commit | 39b69ab5373222812d4e981b27681cd0925fed73 (patch) | |
tree | 17fe9e1bbde799651aa4f9019e640c191840e429 | |
parent | 797695c5ccbfb242f763d552921a23ce03b779ff (diff) |
Fixes to include signal.h
POSIX defines signal.h. sys/signal.h should not be used as it is
c-library internal header which may or may not exist. Notably with
musl it generates warning of being incorrect.
Change-Id: Ia56b0aa1d84b5c590114867b1b384a624f39a6fc
-rw-r--r-- | addons/chan_ooh323.h | 1 | ||||
-rw-r--r-- | apps/app_dahdiras.c | 5 | ||||
-rw-r--r-- | apps/app_dial.c | 2 | ||||
-rw-r--r-- | apps/app_queue.c | 2 | ||||
-rw-r--r-- | channels/chan_console.c | 2 | ||||
-rw-r--r-- | channels/chan_dahdi.c | 4 | ||||
-rw-r--r-- | channels/chan_iax2.c | 1 | ||||
-rw-r--r-- | channels/chan_mgcp.c | 1 | ||||
-rw-r--r-- | channels/chan_motif.c | 2 | ||||
-rw-r--r-- | channels/chan_sip.c | 1 | ||||
-rw-r--r-- | channels/chan_skinny.c | 1 | ||||
-rw-r--r-- | main/cli.c | 1 | ||||
-rw-r--r-- | main/features.c | 2 | ||||
-rw-r--r-- | main/http.c | 2 | ||||
-rw-r--r-- | main/tcptls.c | 1 | ||||
-rw-r--r-- | pbx/pbx_dundi.c | 2 | ||||
-rw-r--r-- | res/res_musiconhold.c | 2 |
17 files changed, 9 insertions, 23 deletions
diff --git a/addons/chan_ooh323.h b/addons/chan_ooh323.h index 89caaff63..1279a2246 100644 --- a/addons/chan_ooh323.h +++ b/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" diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c index e8bdad01e..51921a98e 100644 --- a/apps/app_dahdiras.c +++ b/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> diff --git a/apps/app_dial.c b/apps/app_dial.c index 5e034d3eb..f05521b5d 100644 --- a/apps/app_dial.c +++ b/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> diff --git a/apps/app_queue.c b/apps/app_queue.c index 165924e0c..cd545d2fa 100644 --- a/apps/app_queue.c +++ b/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> diff --git a/channels/chan_console.c b/channels/chan_console.c index 9fdecd7d4..bd849ad53 100644 --- a/channels/chan_console.c +++ b/channels/chan_console.c @@ -64,7 +64,7 @@ ASTERISK_REGISTER_FILE() -#include <sys/signal.h> /* SIGURG */ +#include <signal.h> /* SIGURG */ #include <portaudio.h> diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 2d923433c..e4b7c0ee8 100644 --- a/channels/chan_dahdi.c +++ b/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> diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index af44de96c..721da9a04 100644 --- a/channels/chan_iax2.c +++ b/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> diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 8714ddbbc..6df5d3fd0 100644 --- a/channels/chan_mgcp.c +++ b/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> diff --git a/channels/chan_motif.c b/channels/chan_motif.c index 118d1d9fb..0c710923f 100644 --- a/channels/chan_motif.c +++ b/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> diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 19f8aa308..fc26e7ebf 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -224,7 +224,6 @@ ASTERISK_REGISTER_FILE() #include <signal.h> -#include <sys/signal.h> #include <regex.h> #include <inttypes.h> diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 76990d175..fb6e619a1 100644 --- a/channels/chan_skinny.c +++ b/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> diff --git a/main/cli.c b/main/cli.c index f2bedc91a..8af20b61b 100644 --- a/main/cli.c +++ b/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> diff --git a/main/features.c b/main/features.c index 7dfe4cde5..6806fe749 100644 --- a/main/features.c +++ b/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" diff --git a/main/http.c b/main/http.c index 5ec94a7e1..a8362829e 100644 --- a/main/http.c +++ b/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 */ diff --git a/main/tcptls.c b/main/tcptls.c index f56e0aa70..046501b77 100644 --- a/main/tcptls.c +++ b/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" diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 10495acb6..94b71a002 100644 --- a/pbx/pbx_dundi.c +++ b/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> diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index f124d58f2..3c7199ef4 100644 --- a/res/res_musiconhold.c +++ b/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> |