applied some more cleanup provided by Michael Biebl

5 files changed, 6 insertions, 11 deletions

diff --git a/.cvsignore b/.cvsignore
index 405dee34..3a20ebfb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -19,3 +19,6 @@ stamp-h1
 rfc3195d
 rklogd
 rsyslogd
+INSTALL
+install-sh
+missing
diff --git a/omfwd.c b/omfwd.c
index e310e6fc..6491aea4 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -67,9 +67,6 @@
 #ifdef USE_GSSAPI
 #include "gss-misc.h"
 #endif
-#ifdef USE_NETZIP
-#include <zlib.h>
-#endif
 
 #ifdef SYSLOG_INET
 #define INET_SUSPEND_TIME 60		/* equal to 1 minute 
diff --git a/plugins/ompgsql/.cvsignore b/plugins/ompgsql/.cvsignore
index 1281f785..9730646f 100644
--- a/plugins/ompgsql/.cvsignore
+++ b/plugins/ompgsql/.cvsignore
@@ -2,5 +2,5 @@
 .libs
 Makefile
 Makefile.in
-ommysql.la
-ommysql_la-ommysql.lo
+*.la
+*.lo
diff --git a/syslogd.c b/syslogd.c
index c67e0233..6cf9d557 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -182,9 +182,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-
-#ifndef __sun
-#endif
 #include <arpa/nameser.h>
 #include <arpa/inet.h>
 #include <resolv.h>
@@ -196,7 +193,7 @@
 #include <pthread.h>
 #endif
 
-#if	HAVE_PATHS_H
+#if HAVE_PATHS_H
 #include <paths.h>
 #endif
 
diff --git a/syslogd.h b/syslogd.h
index c1d765eb..43d4f0ea 100644
--- a/syslogd.h
+++ b/syslogd.h
@@ -24,8 +24,6 @@
 #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
  * gain before we submit the message. But to do so we still need to