diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 14:28:30 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 14:28:30 +0100 |
commit | c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c (patch) | |
tree | 107991afae384af32c95be306c86f387ea67083b /tests | |
parent | 81c9cf86267fb0ec1156e578439d09499c97e80f (diff) | |
parent | de7726cbf0957384cc9261ac47d6bf65906739b5 (diff) | |
download | rsyslog-c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c.tar.gz rsyslog-c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c.tar.xz rsyslog-c802afb7e0fc5e2c87af24e12bf63e4a0ba7688c.zip |
Merge branch 'v5-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/property_replacer.html
runtime/datetime.h
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ourtail.c | 1 | ||||
-rw-r--r-- | tests/rt-init.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/ourtail.c b/tests/ourtail.c index 4e8a6412..c31babb9 100644 --- a/tests/ourtail.c +++ b/tests/ourtail.c @@ -26,6 +26,7 @@ * * A copy of the GPL can be found in the file "COPYING" in this distribution. */ +#include "config.h" #include <stdio.h> int main(int __attribute__((unused)) argc, char __attribute__((unused)) *argv[]) diff --git a/tests/rt-init.c b/tests/rt-init.c index b9c4ce2e..66a9ad32 100644 --- a/tests/rt-init.c +++ b/tests/rt-init.c @@ -21,6 +21,7 @@ * * A copy of the GPL can be found in the file "COPYING" in this distribution. */ +#include "config.h" #include "rsyslog.h" #include "testbench.h" #include <stdio.h> /* must be last, else we get a zlib compile error on some platforms */ |