applied some more cleanup provided by Michael Biebl

5 files changed, 6 insertions, 11 deletions

diff --git a/.cvsignore b/.cvsignore
index cbc6b377..98801e5d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -21,3 +21,6 @@ stamp-h1
 rfc3195d
 rklogd
 rsyslogd
+INSTALL
+install-sh
+missing
diff --git a/omfwd.c b/omfwd.c
index c6a60791..e3ec0266 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -68,9 +68,6 @@
 #ifdef USE_GSSAPI
 #include "gss-misc.h"
 #endif
-#ifdef USE_NETZIP
-#include <zlib.h>
-#endif
 
 MODULE_TYPE_OUTPUT
 
diff --git a/plugins/ompgsql/.cvsignore b/plugins/ompgsql/.cvsignore
index 8eec0359..9730646f 100644
--- a/plugins/ompgsql/.cvsignore
+++ b/plugins/ompgsql/.cvsignore
@@ -2,5 +2,5 @@
 .libs
 Makefile
 Makefile.in
-ompgsql.la
-ompgsql_la-ommysql.lo
+*.la
+*.lo
diff --git a/syslogd.c b/syslogd.c
index c9b41d36..e7bb6ed1 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -191,9 +191,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-
-#ifndef __sun
-#endif
 #include <arpa/nameser.h>
 #include <arpa/inet.h>
 #include <resolv.h>
@@ -203,7 +200,7 @@
 
 #include <pthread.h>
 
-#if	HAVE_PATHS_H
+#if HAVE_PATHS_H
 #include <paths.h>
 #endif
 
diff --git a/syslogd.h b/syslogd.h
index b94f6970..fe58b9b9 100644
--- a/syslogd.h
+++ b/syslogd.h
@@ -26,8 +26,6 @@
 #include "template.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
  * gain before we submit the message. But to do so we still need to