diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-14 09:24:57 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-14 09:24:57 +0100 |
| commit | 91d4e54a6707fa87298e367fb734fed931310b40 (patch) | |
| tree | 49622c0786e4ca9fe1a95441a71d35d2fbd33c30 | |
| parent | 4671cad51221f1cb03822481e46669ffba3c6d95 (diff) | |
| download | rsyslog-91d4e54a6707fa87298e367fb734fed931310b40.tar.gz rsyslog-91d4e54a6707fa87298e367fb734fed931310b40.tar.xz rsyslog-91d4e54a6707fa87298e367fb734fed931310b40.zip | |
fixed compile problem from epoll_create patch
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | plugins/imptcp/imptcp.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -3,9 +3,11 @@ Version 5.7.9 [V5-BETA] (rgerhards), 2011-03-?? - improved testbench among others, life tests for ommysql (against a test database) have been added, valgrind-based testing enhanced, ... +- enhance: fallback *at runtime* to epoll_create if epoll_create1 is not + available. Thanks to Michael Biebl for analysis and patch! - bugfix: minor memory leak in omlibdbi (< 1k per instance and run) - bugfix: (regression) omhdfs did no longer compile -- bugfix: omlibdbi did not use password from rsyslog.con +- bugfix: omlibdbi did not use password from rsyslog.conf closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203 --------------------------------------------------------------------------- Version 5.7.8 [V5-BETA] (rgerhards), 2011-03-09 diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c index c4fbab3d..e8cffbb0 100644 --- a/plugins/imptcp/imptcp.c +++ b/plugins/imptcp/imptcp.c @@ -1050,7 +1050,7 @@ CODESTARTwillRun #if defined(EPOLL_CLOEXEC) && defined(HAVE_EPOLL_CREATE1) DBGPRINTF("imptcp uses epoll_create1()\n"); epollfd = epoll_create1(EPOLL_CLOEXEC); - if(epollfd < 0 && errno ENOSYS) + if(epollfd < 0 && errno == ENOSYS) #endif { DBGPRINTF("imptcp uses epoll_create()\n"); |