summaryrefslogtreecommitdiffstats
path: root/runtime/rsyslog.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-04-23 13:02:41 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-04-23 13:02:41 +0100
commit24ad305375cc6832e5b41883ad90816d723841b0 (patch)
tree3300206f899c7699dbe428a75bfae2e7717b131e /runtime/rsyslog.h
parentad2fe36723845ba20d30f14bada37d59e6e90d16 (diff)
parentbbde403b46bd94cb8900562d8cfd3e0540913730 (diff)
downloadrsyslog-24ad305375cc6832e5b41883ad90816d723841b0.tar.gz
rsyslog-24ad305375cc6832e5b41883ad90816d723841b0.tar.xz
rsyslog-24ad305375cc6832e5b41883ad90816d723841b0.zip
Merge branch 'v4-devel' into master
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'runtime/rsyslog.h')
-rw-r--r--runtime/rsyslog.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h
index cc5c845e..0b4fbfed 100644
--- a/runtime/rsyslog.h
+++ b/runtime/rsyslog.h
@@ -149,7 +149,7 @@ typedef struct strmLstnPortList_s strmLstnPortList_t; // TODO: rename?
typedef void nsdsel_t;
typedef void nsdpoll_t;
#else
- typedef obj_t obj_t_ptr;
+ typedef obj_t *obj_t_ptr;
typedef obj_t nsd_t;
typedef obj_t nsdsel_t;
typedef obj_t nsdpoll_t;