diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 14:56:11 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 14:56:11 +0200 |
| commit | 11ab3c800043b036132b0fc96d20bcba637a72b6 (patch) | |
| tree | 1c5b3aea28b51dda271af74cf85113d8cb04db83 | |
| parent | 90880b55689a14ca59cc5eb6ad937401cfabc3e0 (diff) | |
| download | rsyslog-11ab3c800043b036132b0fc96d20bcba637a72b6.tar.gz rsyslog-11ab3c800043b036132b0fc96d20bcba637a72b6.tar.xz rsyslog-11ab3c800043b036132b0fc96d20bcba637a72b6.zip | |
bugfix: netstream ptcp support class was not correctly build on systems without epoll() support
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | runtime/nsd_ptcp.c | 4 | ||||
| -rwxr-xr-x | tests/diag.sh | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,4 +1,8 @@ --------------------------------------------------------------------------- +Version 5.5.4 [DEVEL] (rgerhards), 2010-04-?? +- bugfix: netstream ptcp support class was not correctly build on systems + without epoll() support +--------------------------------------------------------------------------- Version 5.5.3 [DEVEL] (rgerhards), 2010-04-09 - added basic but functional support for Solaris - imported many bugfixes from 3.6.2/4.6.1 (see ChangeLog below!) diff --git a/runtime/nsd_ptcp.c b/runtime/nsd_ptcp.c index 744955c7..ca00749c 100644 --- a/runtime/nsd_ptcp.c +++ b/runtime/nsd_ptcp.c @@ -825,7 +825,9 @@ ENDObjClassInit(nsd_ptcp) BEGINmodExit CODESTARTmodExit +# ifdef HAVE_EPOLL_CREATE /* module only available if epoll() is supported! */ nsdpoll_ptcpClassExit(); +# endif nsdsel_ptcpClassExit(); nsd_ptcpClassExit(); ENDmodExit @@ -844,7 +846,9 @@ CODESTARTmodInit /* Initialize all classes that are in our module - this includes ourselfs */ CHKiRet(nsd_ptcpClassInit(pModInfo)); /* must be done after tcps_sess, as we use it */ CHKiRet(nsdsel_ptcpClassInit(pModInfo)); /* must be done after tcps_sess, as we use it */ +# ifdef HAVE_EPOLL_CREATE /* module only available if epoll() is supported! */ CHKiRet(nsdpoll_ptcpClassInit(pModInfo)); /* must be done after tcps_sess, as we use it */ +# endif ENDmodInit /* vi:set ai: */ diff --git a/tests/diag.sh b/tests/diag.sh index 9ba4ad23..86551155 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -10,7 +10,7 @@ #valgrind="valgrind --tool=helgrind --log-fd=1" #valgrind="valgrind --tool=exp-ptrcheck --log-fd=1" #set -o xtrace -#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction" +#export RSYSLOG_DEBUG="debug nostdout" #export RSYSLOG_DEBUGLOG="log" case $1 in 'init') $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason |