4 files changed, 11 insertions, 2 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index b3b500190..d07749d0b 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -840,6 +840,9 @@
 /* Define to 1 if you have the <sys/param.h> header file. */
 #undef HAVE_SYS_PARAM_H
 
+/* Define to 1 if your system has working sys/poll.h */
+#undef HAVE_SYS_POLL_H
+
 /* Define to 1 if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 4e61668c5..8a7f2f83f 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -125,7 +125,7 @@ References:
 
 #include "asterisk/abstract_jb.h"
 
-#ifdef HAVE_POLL 
+#ifdef HAVE_SYS_POLL_H
 #include <sys/poll.h>
 #else
 #include "asterisk/poll-compat.h"
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index f70dcea16..819ac4675 100644
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -56,6 +56,12 @@
 #include <string.h>
 #endif
 
+#ifdef HAVE_SYS_POLL_H
+#include <sys/poll.h>
+#else
+#include "asterisk/poll-compat.h"
+#endif
+
 #if !defined(HAVE_ASPRINTF) && !defined(__AST_DEBUG_MALLOC)
 int asprintf(char **str, const char *fmt, ...);
 #endif
diff --git a/include/asterisk/io.h b/include/asterisk/io.h
index 247d0de72..6f227dc2c 100644
--- a/include/asterisk/io.h
+++ b/include/asterisk/io.h
@@ -23,7 +23,7 @@
 #ifndef _ASTERISK_IO_H
 #define _ASTERISK_IO_H
 
-#ifdef HAVE_POLL
+#ifdef HAVE_SYS_POLL_H
 #include <sys/poll.h>		/* For POLL* constants */
 #else
 #include "asterisk/poll-compat.h"