diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-08 14:27:20 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-08 14:27:20 +0100 |
| commit | 06387e5592ffb4f7b20ea631f0824ff2cc652c20 (patch) | |
| tree | dc964b62013bf67dc18c73d3fc1f3a97e931fed0 /tests | |
| parent | b4cdb7c997eee95df96321d11d03cf90e4a6caba (diff) | |
| parent | 0b84d47f7a244c25f63fadcec92d12ebfbe319a4 (diff) | |
| download | rsyslog-06387e5592ffb4f7b20ea631f0824ff2cc652c20.tar.gz rsyslog-06387e5592ffb4f7b20ea631f0824ff2cc652c20.tar.xz rsyslog-06387e5592ffb4f7b20ea631f0824ff2cc652c20.zip | |
Merge branch 'v4-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/rt-init.c
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 */ |