Merge "Fix #include poll.h and sys/cdefs.h"

9 years ago · 7bcccd4db3
parent 5164e1fd85 9c1d95e873
commit 7bcccd4db3
4 changed files with 4 additions and 2 deletions
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@ -70,7 +70,7 @@
 #endif

 #ifndef AST_POLL_COMPAT
-#include <sys/poll.h>
+#include <poll.h>
 #else
 #include "asterisk/poll-compat.h"
 #endif
--- 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)

--- a/main/ast_expr2.c
+++ b/main/ast_expr2.c
@ -94,6 +94,7 @@
 #define ASTMM_LIBC ASTMM_REDIRECT
 #include "asterisk.h"

+#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <stdio.h>

--- a/main/ast_expr2.y
+++ b/main/ast_expr2.y
@ -15,6 +15,7 @@
 #define ASTMM_LIBC ASTMM_REDIRECT
 #include "asterisk.h"

+#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <stdio.h>