diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 17:01:16 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 17:01:16 +0200 |
| commit | a1c7bc265554563d1744738994075214e5083566 (patch) | |
| tree | ddf7c6676aa0de18b5986d7e56641465e83fe188 /plugins/imtcp | |
| parent | c5178a4d21cf8ca3362b8a8394d0e762801550a4 (diff) | |
| parent | d071de578454754c4701285b3569e55c5cef1ee4 (diff) | |
| download | rsyslog-a1c7bc265554563d1744738994075214e5083566.tar.gz rsyslog-a1c7bc265554563d1744738994075214e5083566.tar.bz2 rsyslog-a1c7bc265554563d1744738994075214e5083566.zip | |
Merge branch 'runtime'
Conflicts:
ChangeLog
Diffstat (limited to 'plugins/imtcp')
| -rw-r--r-- | plugins/imtcp/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/imtcp/imtcp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/imtcp/Makefile.am b/plugins/imtcp/Makefile.am index fe43cd98..de746a95 100644 --- a/plugins/imtcp/Makefile.am +++ b/plugins/imtcp/Makefile.am @@ -1,6 +1,6 @@ pkglib_LTLIBRARIES = imtcp.la imtcp_la_SOURCES = imtcp.c -imtcp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) +imtcp_la_CPPFLAGS = -I$(top_srcdir) $(pthreads_cflags) $(rsrt_cflags) imtcp_la_LDFLAGS = -module -avoid-version imtcp_la_LIBADD = diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c index 7baa95f2..b7f8f0b5 100644 --- a/plugins/imtcp/imtcp.c +++ b/plugins/imtcp/imtcp.c @@ -39,7 +39,7 @@ #include <fcntl.h> #endif #include "rsyslog.h" -#include "syslogd.h" +#include "dirty.h" #include "cfsysline.h" #include "module-template.h" #include "net.h" |