diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-06-08 14:43:13 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-06-08 14:43:13 -0500 |
| commit | 7bcccd4db3cc271081f2c9eb0d6d1e654ebffc98 (patch) | |
| tree | b41b525454b86f7caa5f88056eb54fca58e9ea50 | |
| parent | 5164e1fd859fcd884a4b9edef7cde3b6e1efc87a (diff) | |
| parent | 9c1d95e87358b17aec9fbb0a13c31b7bb9350450 (diff) | |
Merge "Fix #include poll.h and sys/cdefs.h"
| -rw-r--r-- | include/asterisk/compat.h | 2 | ||||
| -rw-r--r-- | include/asterisk/poll-compat.h | 2 | ||||
| -rw-r--r-- | main/ast_expr2.c | 1 | ||||
| -rw-r--r-- | main/ast_expr2.y | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index 3eb6c96a2..252ce914a 100644 --- 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 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 d41072d6e..c700b01d7 100644 --- 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> diff --git a/main/ast_expr2.y b/main/ast_expr2.y index 762e83d84..df87bcc7f 100644 --- 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> |