changed rsyslog.h include order to solve debian sid zlib inlcude issue

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 <stdio.h>
 #include <assert.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <time.h>
 
-#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 <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -32,7 +33,6 @@
 #include <pwd.h>
 #include <grp.h>
 
-#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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
-#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 <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -34,7 +35,6 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#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 <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -39,7 +40,6 @@
 #include <ctype.h>
 #include <netdb.h>
 
-#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 <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#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 <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -42,7 +43,6 @@
 #include <unistd.h>
 #include <sys/file.h>
 
-#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 <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -47,7 +48,6 @@
 #else
 #include <fcntl.h>
 #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 <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -34,7 +35,6 @@
 #include <signal.h>
 #include <errno.h>
 #include <time.h>
-#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 <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#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 <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
-#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 <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -37,7 +38,6 @@
 #include <assert.h>
 #include <wait.h>
 #include <ctype.h>
-#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 <unistd.h>
 #include <zlib.h>
 /* 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 <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -45,7 +46,6 @@
 #include <pthread.h>
 #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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
-#include "rsyslog.h"
 #include "stringbuf.h"
 #include "syslogd-types.h"
 #include "template.h"