From f2511d3c610684b4c23dd91f1fbbfd90c935102d Mon Sep 17 00:00:00 2001 From: Michael Meckelein Date: Wed, 8 Aug 2007 10:49:38 +0000 Subject: changed rsyslog.h include order to solve debian sid zlib inlcude issue --- action.c | 2 +- cfsysline.c | 2 +- iminternal.c | 2 +- msg.c | 2 +- net.c | 2 +- omdiscard.c | 2 +- omfile.c | 2 +- omfwd.c | 2 +- ommysql.c | 2 +- omshell.c | 2 +- outchannel.c | 2 +- srUtils.c | 2 +- syslogd.h | 1 + tcpsyslog.c | 2 +- template.c | 2 +- 15 files changed, 15 insertions(+), 14 deletions(-) diff --git a/action.c b/action.c index 7d0a47d0..6dc58c4d 100644 --- a/action.c +++ b/action.c @@ -23,13 +23,13 @@ * A copy of the GPL can be found in the file "COPYING" in this distribution. */ #include "config.h" +#include "rsyslog.h" #include #include #include #include #include -#include "rsyslog.h" #include "syslogd.h" #include "template.h" #include "action.h" diff --git a/cfsysline.c b/cfsysline.c index 84583190..14b113cb 100644 --- a/cfsysline.c +++ b/cfsysline.c @@ -23,6 +23,7 @@ */ #include "config.h" +#include "rsyslog.h" #include #include #include @@ -32,7 +33,6 @@ #include #include -#include "rsyslog.h" #include "syslogd.h" /* TODO: when the module interface & library design is done, this should be able to go away */ #include "cfsysline.h" #include "srUtils.h" diff --git a/iminternal.c b/iminternal.c index a52fe741..9fce41a7 100644 --- a/iminternal.c +++ b/iminternal.c @@ -25,13 +25,13 @@ * A copy of the GPL can be found in the file "COPYING" in this distribution. */ #include "config.h" +#include "rsyslog.h" #include #include #include #include -#include "rsyslog.h" #include "syslogd.h" #include "linkedlist.h" #include "iminternal.h" diff --git a/msg.c b/msg.c index 6a7e7c19..3ba92b10 100644 --- a/msg.c +++ b/msg.c @@ -26,6 +26,7 @@ * A copy of the GPL can be found in the file "COPYING" in this distribution. */ #include "config.h" +#include "rsyslog.h" #include #include #include @@ -34,7 +35,6 @@ #include #include #include -#include "rsyslog.h" #include "syslogd.h" #include "srUtils.h" #include "template.h" diff --git a/net.c b/net.c index 00a445ca..bf0e468b 100644 --- a/net.c +++ b/net.c @@ -29,6 +29,7 @@ #ifdef SYSLOG_INET +#include "rsyslog.h" #include #include #include @@ -39,7 +40,6 @@ #include #include -#include "rsyslog.h" #include "syslogd.h" #include "syslogd-types.h" #include "net.h" diff --git a/omdiscard.c b/omdiscard.c index 7a21e46c..d3350032 100644 --- a/omdiscard.c +++ b/omdiscard.c @@ -25,12 +25,12 @@ * A copy of the GPL can be found in the file "COPYING" in this distribution. */ #include "config.h" +#include "rsyslog.h" #include #include #include #include #include -#include "rsyslog.h" #include "syslogd.h" #include "syslogd-types.h" #include "omdiscard.h" diff --git a/omfile.c b/omfile.c index aba68256..6f30108b 100644 --- a/omfile.c +++ b/omfile.c @@ -31,6 +31,7 @@ * A copy of the GPL can be found in the file "COPYING" in this distribution. */ #include "config.h" +#include "rsyslog.h" #include #include #include @@ -42,7 +43,6 @@ #include #include -#include "rsyslog.h" #include "syslogd.h" #include "syslogd-types.h" #include "srUtils.h" diff --git a/omfwd.c b/omfwd.c index 962ec166..096d5d78 100644 --- a/omfwd.c +++ b/omfwd.c @@ -30,6 +30,7 @@ */ #include "config.h" #ifdef SYSLOG_INET +#include "rsyslog.h" #include #include #include @@ -47,7 +48,6 @@ #else #include #endif -#include "rsyslog.h" #include "syslogd.h" #include "syslogd-types.h" #include "srUtils.h" diff --git a/ommysql.c b/ommysql.c index 43cd9ae1..6fe4dccd 100644 --- a/ommysql.c +++ b/ommysql.c @@ -26,6 +26,7 @@ */ #include "config.h" #ifdef WITH_DB +#include "rsyslog.h" #include #include #include @@ -34,7 +35,6 @@ #include #include #include -#include "rsyslog.h" #include "syslogd.h" #include "syslogd-types.h" #include "srUtils.h" diff --git a/omshell.c b/omshell.c index e9b72b42..ac0c9aad 100644 --- a/omshell.c +++ b/omshell.c @@ -31,12 +31,12 @@ * A copy of the GPL can be found in the file "COPYING" in this distribution. */ #include "config.h" +#include "rsyslog.h" #include #include #include #include #include -#include "rsyslog.h" #include "syslogd.h" #include "syslogd-types.h" #include "srUtils.h" diff --git a/outchannel.c b/outchannel.c index 13161a80..a713680f 100644 --- a/outchannel.c +++ b/outchannel.c @@ -13,13 +13,13 @@ #define BSD #endif +#include "rsyslog.h" #include #include #include #include #include #include -#include "rsyslog.h" #include "stringbuf.h" #include "outchannel.h" #include "syslogd.h" diff --git a/srUtils.c b/srUtils.c index 4834cfb3..0aed9de8 100755 --- a/srUtils.c +++ b/srUtils.c @@ -27,6 +27,7 @@ */ #include "config.h" +#include "rsyslog.h" /* THIS IS A MODIFICATION FOR RSYSLOG! 2004-11-18 rgerards */ #include #include #include @@ -37,7 +38,6 @@ #include #include #include -#include "rsyslog.h" /* THIS IS A MODIFICATION FOR RSYSLOG! 2004-11-18 rgerards */ #include "liblogging-stub.h" /* THIS IS A MODIFICATION FOR RSYSLOG! 2004-11-18 rgerards */ #define TRUE 1 #define FALSE 0 diff --git a/syslogd.h b/syslogd.h index 99ce63f2..080f15e2 100644 --- a/syslogd.h +++ b/syslogd.h @@ -24,6 +24,7 @@ #include "objomsr.h" #ifdef USE_NETZIP +#include #include /* config param: minimum message size to try compression. The smaller * the message, the less likely is any compression gain. We check for diff --git a/tcpsyslog.c b/tcpsyslog.c index 327e7972..27ef8e40 100644 --- a/tcpsyslog.c +++ b/tcpsyslog.c @@ -26,6 +26,7 @@ * A copy of the GPL can be found in the file "COPYING" in this distribution. */ #include "config.h" +#include "rsyslog.h" #include #include #include @@ -45,7 +46,6 @@ #include #endif -#include "rsyslog.h" #include "syslogd.h" #include "syslogd-types.h" #include "net.h" diff --git a/template.c b/template.c index 6a3fbb7d..6f2c1025 100644 --- a/template.c +++ b/template.c @@ -9,12 +9,12 @@ #define BSD #endif +#include "rsyslog.h" #include #include #include #include #include -#include "rsyslog.h" #include "stringbuf.h" #include "syslogd-types.h" #include "template.h" -- cgit