diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 11:05:18 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 11:05:18 +0200 |
commit | fc0712f40ae63aa54080683c7ee5ae52055c009d (patch) | |
tree | b236e751acbe262a1f334221d523a2f121a3edff /runtime/rsyslog.h | |
parent | e89ae2e7b18ba935d7eea4c44f3ec15ff6dcfb31 (diff) | |
parent | eb1615068c6a704287eda732d287280df4cc4c44 (diff) | |
download | rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.tar.gz rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.tar.xz rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.zip |
Merge branch 'master' into ultra-reliable
Conflicts:
tests/Makefile.am
tests/diskqueue.sh
Diffstat (limited to 'runtime/rsyslog.h')
-rw-r--r-- | runtime/rsyslog.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index 465c9ab5..0c671f03 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -99,6 +99,7 @@ typedef rsRetVal (*errLogFunc_t)(uchar*); /* this is a trick to store a function typedef struct permittedPeers_s permittedPeers_t; /* this should go away in the long term -- rgerhards, 2008-05-19 */ typedef struct permittedPeerWildcard_s permittedPeerWildcard_t; /* this should go away in the long term -- rgerhards, 2008-05-19 */ typedef struct tcpsrv_s tcpsrv_t; +typedef struct tcps_sess_s tcps_sess_t; typedef struct vmstk_s vmstk_t; typedef struct batch_obj_s batch_obj_t; typedef struct batch_s batch_t; |