From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Mon, 6 Dec 2010 20:06:08 +0000 (+0200)
Subject: fix compile error on OpenSolaris using SunStudio CC
X-Git-Tag: take1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4db984be817781d191f2340054c9316be52bd813;p=thirdparty%2Fsquid.git

fix compile error on OpenSolaris using SunStudio CC

The way the TidyPointer used inside ssl/gadgets.h which included
through ssl/support.h in squid.h file  requires the ssl libraries
linked with every binary, even if not realy needed.
To solve this probelm remove the 'include "ssl/support.h"' line
from the squid.h and add it only where required.
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 77c2771262..12fd981e55 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -47,6 +47,7 @@
 #include "adaptation/ecap/Config.h"
 #endif
 #if USE_SSL
+#include "ssl/support.h"
 #include "ssl/Config.h"
 #endif
 #include "auth/Config.h"
diff --git a/src/client_side.cc b/src/client_side.cc
index 58eb9e7bdd..229cb1179c 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -119,6 +119,7 @@
 #if USE_SSL
 #include "ssl/context_storage.h"
 #include "ssl/helper.h"
+#include "ssl/support.h"
 #include "ssl/gadgets.h"
 #endif
 #if USE_SSL_CRTD
diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 280828ea1c..161819cf1c 100644
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -71,6 +71,9 @@
 #include "SquidTime.h"
 #include "wordlist.h"
 #include "err_detail_type.h"
+#if USE_SSL
+#include "ssl/support.h"
+#endif
 
 
 #if LINGERING_CLOSE
diff --git a/src/comm.cc b/src/comm.cc
index 7fe3c10826..cc78e490fc 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -56,6 +56,9 @@
 #include "ip/QosConfig.h"
 #include "ip/tools.h"
 #include "ClientInfo.h"
+#if USE_SSL
+#include "ssl/support.h"
+#endif
 
 #include "cbdata.h"
 #if defined(_SQUID_CYGWIN_)
diff --git a/src/external_acl.cc b/src/external_acl.cc
index 192948806b..165ee86b24 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -64,6 +64,9 @@
 #include "rfc1738.h"
 #include "URLScheme.h"
 #include "wordlist.h"
+#if USE_SSL
+#include "ssl/support.h"
+#endif
 
 #ifndef DEFAULT_EXTERNAL_ACL_TTL
 #define DEFAULT_EXTERNAL_ACL_TTL 1 * 60 * 60
diff --git a/src/forward.cc b/src/forward.cc
index 3be7191838..906918105a 100644
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -51,6 +51,9 @@
 #include "ip/Intercept.h"
 #include "ip/tools.h"
 #include "mgr/Registration.h"
+#if USE_SSL
+#include "ssl/support.h"
+#endif
 
 static PSC fwdStartCompleteWrapper;
 static PF fwdServerClosedWrapper;
diff --git a/src/redirect.cc b/src/redirect.cc
index 999474b535..2474bd7981 100644
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -44,6 +44,9 @@
 #include "client_side.h"
 #include "helper.h"
 #include "rfc1738.h"
+#if USE_SSL
+#include "ssl/support.h"
+#endif
 
 typedef struct {
     void *data;
diff --git a/src/squid.h b/src/squid.h
index 2c05e4b325..f73691b651 100644
--- a/src/squid.h
+++ b/src/squid.h
@@ -154,9 +154,6 @@ using namespace Squid;
 #endif
 
 #include "md5.h"
-#if USE_SSL
-#include "ssl/support.h"
-#endif
 #if SQUID_SNMP
 #include "cache_snmp.h"
 #endif
diff --git a/src/ssl/support.cc b/src/ssl/support.cc
index a86afd0fcf..0f51098606 100644
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@ -42,6 +42,7 @@
 
 #include "fde.h"
 #include "acl/FilledChecklist.h"
+#include "ssl/support.h"
 #include "ssl/gadgets.h"
 
 /**
diff --git a/src/stat.cc b/src/stat.cc
index 47143b2882..a020ccf4e9 100644
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -56,6 +56,9 @@
 #include "mgr/IntervalAction.h"
 #include "mgr/IoAction.h"
 #include "mgr/ServiceTimesAction.h"
+#if USE_SSL
+#include "ssl/support.h"
+#endif
 
 /* these are included because they expose stats calls */
 /* TODO: provide a self registration mechanism for those classes
diff --git a/src/structs.h b/src/structs.h
index 86ba396553..67fd632f61 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -40,6 +40,10 @@
 /* for ICP_END */
 #include "icp_opcode.h"
 
+#if USE_SSL
+#include <openssl/ssl.h>
+#endif
+
 #define PEER_MULTICAST_SIBLINGS 1
 
 struct acl_name_list {