summaryrefslogtreecommitdiffstats
path: root/runtime/errmsg.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-02-18 10:51:14 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-02-18 10:51:14 +0100
commit9568e7dbbb50ceb7464b659283e97a63ba3b1bd6 (patch)
treec5f10c015dae3fcfcf52e2bc5985d40cb70fa119 /runtime/errmsg.h
parentb941f68aaeec4bd458328e09121b623ac63f6dd6 (diff)
parent9f1e195f3d642de85a92199ef9882b820d3fec21 (diff)
downloadrsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.tar.gz
rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.tar.xz
rsyslog-9568e7dbbb50ceb7464b659283e97a63ba3b1bd6.zip
Merge branch 'v5-beta'
Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c
Diffstat (limited to 'runtime/errmsg.h')
-rw-r--r--runtime/errmsg.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/errmsg.h b/runtime/errmsg.h
index 799954fb..ac7018b3 100644
--- a/runtime/errmsg.h
+++ b/runtime/errmsg.h
@@ -30,6 +30,7 @@
/* the errmsg object */
typedef struct errmsg_s {
+ char dummy;
} errmsg_t;