diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-17 06:33:07 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-17 06:33:07 +0000 |
| commit | 1ccd0d8633d2f4d7f8c69838676bbbcfee001a50 (patch) | |
| tree | d386269f08375e9b9476aff1b8a87ad8e8abd780 /include | |
| parent | 85a28052d3c1b1d8b1f923f99b0ad4405aacd875 (diff) | |
Update the configure script check for sys/poll.h to also provide the result in
include/asterisk/autoconfig.h. Also, move the conditional include of sys/poll.h
or asterisk/poll-compat.h into asterisk/config.h instead of the two headers it
existed in before.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89361 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 3 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 2 | ||||
| -rw-r--r-- | include/asterisk/compat.h | 6 | ||||
| -rw-r--r-- | include/asterisk/io.h | 2 |
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" |