diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 18:04:00 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 18:04:00 +0100 |
| commit | 786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e (patch) | |
| tree | 1948874c8d8b7a876ad5e3817a292889b94a68d4 /runtime/nsdpoll_ptcp.c | |
| parent | 950fe206f84322bdff755988403a9d4017ec26f4 (diff) | |
| parent | 44300ddcb2904105e2ecd56479bf396399dcab26 (diff) | |
| download | rsyslog-786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e.tar.gz rsyslog-786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e.tar.bz2 rsyslog-786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e.zip | |
Merge branch 'v5-devel'
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'runtime/nsdpoll_ptcp.c')
| -rw-r--r-- | runtime/nsdpoll_ptcp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/runtime/nsdpoll_ptcp.c b/runtime/nsdpoll_ptcp.c index 51006707..bc374c60 100644 --- a/runtime/nsdpoll_ptcp.c +++ b/runtime/nsdpoll_ptcp.c @@ -42,7 +42,6 @@ #include "nspoll.h" #include "nsd_ptcp.h" #include "nsdpoll_ptcp.h" -#include "unlimited_select.h" /* static data */ DEFobjStaticHelpers |