diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-04-01 10:59:32 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-04-01 10:59:32 +0000 |
| commit | 3731fd9ccce8d93a0bb22f8ba0db277652537335 (patch) | |
| tree | 3f7181612491fd8769545898d5097b44a500865d /include/asterisk/select.h | |
| parent | e59a051c3e94820f6b31f3781707f9e49506db8a (diff) | |
Merged revisions 312286,312288 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r312286 | tilghman | 2011-04-01 05:44:33 -0500 (Fri, 01 Apr 2011) | 2 lines
Reload must react correctly against a possibly changed table, so dropping the conditional reload flag.
................
r312288 | tilghman | 2011-04-01 05:58:45 -0500 (Fri, 01 Apr 2011) | 21 lines
Merged revisions 312287 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r312287 | tilghman | 2011-04-01 05:51:24 -0500 (Fri, 01 Apr 2011) | 14 lines
Merged revisions 312285 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r312285 | tilghman | 2011-04-01 05:36:42 -0500 (Fri, 01 Apr 2011) | 7 lines
Found some leaking file descriptors while looking at ast_FD_SETSIZE dead code.
(issue #18969)
Reported by: oej
Patches:
20110315__issue18969__14.diff.txt uploaded by tilghman (license 14)
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@312289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/select.h')
| -rw-r--r-- | include/asterisk/select.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asterisk/select.h b/include/asterisk/select.h index ac2284fc7..a8f7c3c60 100644 --- a/include/asterisk/select.h +++ b/include/asterisk/select.h @@ -38,8 +38,9 @@ extern unsigned int ast_FD_SETSIZE; #if !defined(HAVE_VARIABLE_FDSET) && defined(CONFIGURE_RAN_AS_ROOT) #define ast_fdset fd_set #else +#define ast_FDMAX 32768 typedef struct { - TYPEOF_FD_SET_FDS_BITS fds_bits[4096 / SIZEOF_FD_SET_FDS_BITS]; /* 32768 bits */ + TYPEOF_FD_SET_FDS_BITS fds_bits[ast_FDMAX / 8 / SIZEOF_FD_SET_FDS_BITS]; /* 32768 bits */ } ast_fdset; #undef FD_ZERO |