diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-25 01:48:17 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-25 01:48:17 +0000 |
commit | 0519227e4d016eaacdc2c387f9a1d002d6eff5c3 (patch) | |
tree | d79507280d51a3d3dd989990088957e63b8fffad /include/asterisk | |
parent | 91210c7b9dc322ed12b4ce781436a04983bce7e8 (diff) |
Merged revisions 184147 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r184147 | russell | 2009-03-24 20:42:10 -0500 (Tue, 24 Mar 2009) | 5 lines
Fix build issues on Mac OSX.
(closes issue #14714)
Reported by: ygor
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@184148 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
-rw-r--r-- | include/asterisk/compat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h index 41e5a6b8f..d828b5270 100644 --- a/include/asterisk/compat.h +++ b/include/asterisk/compat.h @@ -67,7 +67,7 @@ #include <string.h> #endif -#ifdef HAVE_SYS_POLL_H +#ifndef AST_POLL_COMPAT #include <sys/poll.h> #else #include "asterisk/poll-compat.h" |