diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-10 05:33:04 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-09-10 05:33:04 +0000 |
commit | 57efeb40a60e668af93be6669cc6ded7f9d48dce (patch) | |
tree | 4b398ba2eb6a3f93071dd187e70f04074ac621fa /include/asterisk/select.h | |
parent | 336d2a1abdcaef1d625d4fb78cd04ae5560d6fba (diff) |
Merged revisions 285962 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r285962 | tilghman | 2010-09-10 00:32:18 -0500 (Fri, 10 Sep 2010) | 13 lines
Merged revisions 285961 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r285961 | tilghman | 2010-09-10 00:31:31 -0500 (Fri, 10 Sep 2010) | 6 lines
Another fix for Mac OS X.
While trying to fix this the "right" way, I wandered into dependency hell. Two
hours later, I backed out, and just removed the offending code. ast_inline_api
only goes one level deep and then it breaks. Ouch.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285963 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/select.h')
-rw-r--r-- | include/asterisk/select.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/asterisk/select.h b/include/asterisk/select.h index 773b0a54e..ac2284fc7 100644 --- a/include/asterisk/select.h +++ b/include/asterisk/select.h @@ -23,10 +23,11 @@ #ifndef __AST_SELECT_H #define __AST_SELECT_H -#include "asterisk/autoconfig.h" +#include <sys/time.h> #include <sys/select.h> #include <errno.h> -#include "asterisk/utils.h" + +#include "asterisk/compat.h" #ifdef __cplusplus extern "C" { @@ -57,7 +58,7 @@ typedef struct { if (fd / sizeof(*bytes) + ((fd + 1) % sizeof(*bytes) ? 1 : 0) < sizeof(*(fds))) { \ bytes[fd / (sizeof(*bytes) * 8)] |= ((TYPEOF_FD_SET_FDS_BITS) 1) << (fd % (sizeof(*bytes) * 8)); \ } else { \ - ast_log(LOG_ERROR, "FD %d exceeds the maximum size of ast_fdset!\n", fd); \ + fprintf(stderr, "FD %d exceeds the maximum size of ast_fdset!\n", fd); \ } \ } while (0) #endif /* HAVE_VARIABLE_FDSET */ @@ -75,12 +76,9 @@ typedef struct { static inline int ast_select(int nfds, ast_fdset *rfds, ast_fdset *wfds, ast_fdset *efds, struct timeval *tvp) { #ifdef __linux__ - ast_assert((unsigned int) nfds <= ast_FD_SETSIZE); return select(nfds, (fd_set *) rfds, (fd_set *) wfds, (fd_set *) efds, tvp); #else int save_errno = 0; - - ast_assert((unsigned int) nfds <= ast_FD_SETSIZE); if (tvp) { struct timeval tv, tvstart, tvend, tvlen; int res; |