diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-06 12:04:36 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-06 12:04:36 +0200 |
| commit | 3ab1e5b943d297ed0b23a8988f354fed3fec9fdf (patch) | |
| tree | 4e4e29a0911eebb7e2842e3ec5a6d9a5686720ae /runtime/netstrm.c | |
| parent | 200e08ac4252a0a0eca31a441e63688179baebb1 (diff) | |
| parent | bb6f5dc40f39220a2cdb05e94d70aac42d971ac4 (diff) | |
| download | rsyslog-3ab1e5b943d297ed0b23a8988f354fed3fec9fdf.tar.gz rsyslog-3ab1e5b943d297ed0b23a8988f354fed3fec9fdf.tar.bz2 rsyslog-3ab1e5b943d297ed0b23a8988f354fed3fec9fdf.zip | |
Merge branch 'master' into master-newruleset
Conflicts:
runtime/rsconf.c
Diffstat (limited to 'runtime/netstrm.c')
| -rw-r--r-- | runtime/netstrm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/netstrm.c b/runtime/netstrm.c index a6f840a5..49ba8f35 100644 --- a/runtime/netstrm.c +++ b/runtime/netstrm.c @@ -250,7 +250,7 @@ EnableKeepAlive(netstrm_t *pThis) /* check connection - slim wrapper for NSD driver function */ -static void +static rsRetVal CheckConnection(netstrm_t *pThis) { ISOBJ_TYPE_assert(pThis, netstrm); |