From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 6 Jul 2013 15:11:43 +0000 (-0600)
Subject: Cleanup: remove duplicate includes
X-Git-Tag: SQUID_3_4_0_1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a90d1dde0bd0edb74f3982eece5cd3087ca8115;p=thirdparty%2Fsquid.git

Cleanup: remove duplicate includes

Remove duplicate includes of system files already pulled in by compat/types.h
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 56e6c2fafa..e9c3e18032 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -114,9 +114,6 @@
 #if HAVE_LIST
 #include <list>
 #endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #if HAVE_PWD_H
 #include <pwd.h>
 #endif
diff --git a/src/eui/Eui48.cc b/src/eui/Eui48.cc
index c825ad4ae1..d7d9ab7a78 100644
--- a/src/eui/Eui48.cc
+++ b/src/eui/Eui48.cc
@@ -63,9 +63,6 @@ struct arpreq {
 #include <Iphlpapi.h>
 #endif
 
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #if HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
diff --git a/src/fatal.cc b/src/fatal.cc
index 3e0af1a736..e6f3c74106 100644
--- a/src/fatal.cc
+++ b/src/fatal.cc
@@ -37,9 +37,6 @@
 #if HAVE_STDIO_H
 #include <stdio.h>
 #endif
-#if HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
 
 static void
 fatal_common(const char *message)
diff --git a/src/fd.cc b/src/fd.cc
index 29fac197e4..41f9d2ce8e 100644
--- a/src/fd.cc
+++ b/src/fd.cc
@@ -42,7 +42,7 @@
 
 // Solaris and possibly others lack MSG_NOSIGNAL optimization
 // TODO: move this into compat/? Use a dedicated compat file to avoid dragging
-// sys/types.h and sys/socket.h into the rest of Squid??
+// sys/socket.h into the rest of Squid??
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
 #endif
diff --git a/src/win32.h b/src/win32.h
index d222c21882..b32c8c5bf9 100644
--- a/src/win32.h
+++ b/src/win32.h
@@ -41,12 +41,6 @@
 #if HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
-#if HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 
 void WIN32_ExceptionHandlerInit(void);