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 77c27712627d265f045b4a64a50003cc127da943..12fd981e55c963a9bc4c92d56a4818458a895e6b 100644 (file)
--- 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 58eb9e7bdde5845c2d5c00d3063cf06e0d9b1df5..229cb1179c1e9bdd4ccb065ca1c588ee819edaa9 100644 (file)
--- 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 280828ea1cc7a956460b636d18a2dae4a9e1067b..161819cf1c1ef0f948fe96f06595a7d1ca585ce7 100644 (file)
--- 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 7fe3c108265a529500d0d068315d916a25e3a576..cc78e490fcd1b50591fbacdef1184bdf878770b0 100644 (file)
--- 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 192948806b62bbe46f4ce96420a0935c8c0de438..165ee86b24523d5cdc753b335ce98d74ae4eb099 100644 (file)
--- 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 3be71918389bb803723d4afaf61e195cf8a2f6e3..906918105a02d553f7ffe1b70388d4a122a03157 100644 (file)
--- 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 999474b5350d44bbc468eca273c02e4c4ad63829..2474bd798104985dc05ee64c8dcbe47559d14b3e 100644 (file)
--- 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 2c05e4b325966d6d950249abf888890d5e52369c..f73691b65139dfbcf8b59a200679ce0fbb896be6 100644 (file)
--- 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 a86afd0fcf0d71a47e4a8a19788cb7b4d98723fe..0f51098606948f0b2210775fd87bd9ea7247ca6b 100644 (file)
--- 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 47143b288243ab7e34a9ac0da8304b5f8a53d456..a020ccf4e96dd1e3d82c0fd7ce7a462455162817 100644 (file)
--- 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 86ba3965538471bc39bbbc141691dded3b03a8b7..67fd632f61e5770ae2f2df26f4166b308773ddc6 100644 (file)
--- 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 {