summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2016-06-02 22:53:39 +0300
committerJoshua Colp <jcolp@digium.com>2016-06-07 19:01:26 -0500
commit9c5a0b814b9fa6f7348cb7fbfdd0bc1204e72b77 (patch)
treeaadb8812f4462d80d435bf95c33a22e01ed11c6d
parentae8f6e996ec9052623cdf75d656112af8b8ccd05 (diff)
Fix #include poll.h and sys/cdefs.h
POSIX defines poll.h, sys/poll.h should not be used at is c-library internal header which may or may not exist. Notable in musl it generates warning of being incorrect. And add explict include of sys/cdefs.h where needed. Change-Id: I142930df53fe7585a06b854b6faddc5301e024be
-rw-r--r--include/asterisk/compat.h2
-rw-r--r--include/asterisk/poll-compat.h2
-rw-r--r--main/ast_expr2.c1
-rw-r--r--main/ast_expr2.y1
4 files changed, 4 insertions, 2 deletions
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index c9c99c150..c7bc5b093 100644
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -68,7 +68,7 @@
#endif
#ifndef AST_POLL_COMPAT
-#include <sys/poll.h>
+#include <poll.h>
#else
#include "asterisk/poll-compat.h"
#endif
diff --git a/include/asterisk/poll-compat.h b/include/asterisk/poll-compat.h
index cbb610925..72ac2c3e2 100644
--- a/include/asterisk/poll-compat.h
+++ b/include/asterisk/poll-compat.h
@@ -83,7 +83,7 @@
#ifndef AST_POLL_COMPAT
-#include <sys/poll.h>
+#include <poll.h>
#define ast_poll(a, b, c) poll(a, b, c)
diff --git a/main/ast_expr2.c b/main/ast_expr2.c
index 798e3d3ce..a9e4eff44 100644
--- a/main/ast_expr2.c
+++ b/main/ast_expr2.c
@@ -93,6 +93,7 @@
#include "asterisk.h"
+#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdio.h>
diff --git a/main/ast_expr2.y b/main/ast_expr2.y
index 83d3effe3..869dfe9ea 100644
--- a/main/ast_expr2.y
+++ b/main/ast_expr2.y
@@ -14,6 +14,7 @@
#include "asterisk.h"
+#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdio.h>