Windows port: fix Visual Studio build problems when ESI, Delay Pools and SSL support...

MS Visual Studio Projects are monolithic, so we need some #if/#ifdef to exclude
the not needed code at build time.

diff --git a/src/ACLCertificate.cc b/src/ACLCertificate.cc
index cb9a8935616a093ede63826f864bb8ca08fcc77f..bf4c9e6c6714c0b3986049b16d5586b910d3faa5 100644 (file)
--- a/src/ACLCertificate.cc
+++ b/src/ACLCertificate.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLCertificate.cc,v 1.2 2003/03/04 01:40:25 robertc Exp $
+ * $Id: ACLCertificate.cc,v 1.3 2008/01/20 19:46:35 serassio Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -35,6 +35,12 @@
  */
 
 #include "squid.h"
+
+/* MS Visual Studio Projects are monolithic, so we need the following
+ * #if to exclude the SSL code from compile process when not needed.
+ */
+#if USE_SSL
+
 #include "ACLCertificate.h"
 #include "ACLChecklist.h"
 #include "ACLCertificateData.h"
@@ -60,3 +66,5 @@ ACLCertificateStrategy::Instance()
 }
 
 ACLCertificateStrategy ACLCertificateStrategy::Instance_;
+
+#endif /* USE_SSL */

diff --git a/src/DelayId.cc b/src/DelayId.cc
index bd71b95cee55e1ec8203180d107e030cdca02f5a..a1b985292cc969ff67067d7ca48da9b4a8b46186 100644 (file)
--- a/src/DelayId.cc
+++ b/src/DelayId.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DelayId.cc,v 1.24 2007/12/14 23:11:45 amosjeffries Exp $
+ * $Id: DelayId.cc,v 1.25 2008/01/20 19:46:35 serassio Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -39,9 +39,11 @@
 
 #include "config.h"
 
-#if !DELAY_POOLS
-#error DELAY_POOLS not enabled
-#endif
+/* MS Visual Studio Projects are monolithic, so we need the following
+ * #if to exclude the delay pools code from compile process when not needed.
+ */
+#if DELAY_POOLS
+
 #include "squid.h"
 #include "DelayId.h"
 #include "client_side_request.h"
@@ -186,3 +188,5 @@ DelayId::delayRead(DeferredRead const &aRead)
     compositeId->delayRead(aRead);
 
 }
+
+#endif /* DELAY_POOLS */

diff --git a/src/ESI.cc b/src/ESI.cc
index 4fc7b18040da58198e5980432d0c37984c2f83d5..05a36339fc055209c049ba37e70d7e77db0b864c 100644 (file)
--- a/src/ESI.cc
+++ b/src/ESI.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESI.cc,v 1.28 2008/01/07 17:12:28 hno Exp $
+ * $Id: ESI.cc,v 1.29 2008/01/20 19:46:35 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -35,6 +35,12 @@
  */
 
 #include "squid.h"
+
+/* MS Visual Studio Projects are monolithic, so we need the following
+ * #if to exclude the ESI code from compile process when not needed.
+ */
+#if (USE_SQUID_ESI == 1)
+
 #include "ESI.h"
 #include "clientStream.h"
 #include "client_side_request.h"
@@ -2459,4 +2465,4 @@ esiEnableProcessing (HttpReply *rep)
     return rv;
 }
 
-
+#endif /* USE_SQUID_ESI == 1 */

diff --git a/src/ESIAssign.cc b/src/ESIAssign.cc
index dbf04abd46e638372e090bf7c82389b69208d723..4ed22005df6a4f40f71996f631e9668955c7a03e 100644 (file)
--- a/src/ESIAssign.cc
+++ b/src/ESIAssign.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESIAssign.cc,v 1.6 2007/05/29 13:31:37 amosjeffries Exp $
+ * $Id: ESIAssign.cc,v 1.7 2008/01/20 19:46:35 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -34,7 +34,13 @@
  */
 
 #include "squid.h"
-#include "ESIAssign.h"
+#
+/* MS Visual Studio Projects are monolithic, so we need the following
+ * #if to exclude the ESI code from compile process when not needed.
+ */
+#if (USE_SQUID_ESI == 1)
+
+include "ESIAssign.h"
 #include "ESIContext.h"
 #include "ESISequence.h"
 
@@ -190,3 +196,5 @@ ESIVariableExpression::eval (ESIVarState &state, char const *subref, char const
     /* XXX: Implement evaluation of the expression */
     ESISegment::ListAppend (state.getOutput(), expression.buf(), expression.size());
 }
+
+#endif /* USE_SQUID_ESI == 1 */

diff --git a/src/ESIContext.cc b/src/ESIContext.cc
index 8bd35a5dfe7a54aae6528e42e250479a1a4612be..e0ab92519a24b44396484694323ee1c97f8bb65e 100644 (file)
--- a/src/ESIContext.cc
+++ b/src/ESIContext.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESIContext.cc,v 1.3 2007/04/28 22:26:37 hno Exp $
+ * $Id: ESIContext.cc,v 1.4 2008/01/20 19:46:35 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -34,6 +34,12 @@
  */
 
 #include "squid.h"
+
+/* MS Visual Studio Projects are monolithic, so we need the following
+ * #if to exclude the ESI code from compile process when not needed.
+ */
+#if (USE_SQUID_ESI == 1)
+
 #include "ESIContext.h"
 #include "Store.h"
 #include "client_side_request.h"
@@ -106,3 +112,5 @@ ESIContext::setErrorMessage(char const *anError)
     if (!errormessage)
         errormessage = xstrdup (anError);
 }
+
+#endif /* USE_SQUID_ESI == 1 */

diff --git a/src/ESIInclude.cc b/src/ESIInclude.cc
index e31baa0d42cf27085b4beb441596952f3fdf8de0..906f0c125c70e61426f49b7146d9bb6bbab75964 100644 (file)
--- a/src/ESIInclude.cc
+++ b/src/ESIInclude.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESIInclude.cc,v 1.14 2007/08/27 12:50:42 hno Exp $
+ * $Id: ESIInclude.cc,v 1.15 2008/01/20 19:46:35 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -35,6 +35,12 @@
  */
 
 #include "squid.h"
+
+/* MS Visual Studio Projects are monolithic, so we need the following
+ * #if to exclude the ESI code from compile process when not needed.
+ */
+#if (USE_SQUID_ESI == 1)
+
 #include "ESIInclude.h"
 #include "ESIVarState.h"
 #include "client_side_request.h"
@@ -591,3 +597,4 @@ ESIInclude::subRequestDone (ESIStreamContext::Pointer stream, bool success)
     }
 }
 
+#endif /* USE_SQUID_ESI == 1 */

diff --git a/src/ESISequence.cc b/src/ESISequence.cc
index 3f2222827b6d0faf0e8671eebfd5f2b2d1bed306..df7bfb4308f3fb5982b16b7699be38b2fce4d726 100644 (file)
--- a/src/ESISequence.cc
+++ b/src/ESISequence.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ESISequence.cc,v 1.6 2007/04/28 22:26:37 hno Exp $
+ * $Id: ESISequence.cc,v 1.7 2008/01/20 19:46:35 serassio Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -34,6 +34,12 @@
  */
 
 #include "squid.h"
+
+/* MS Visual Studio Projects are monolithic, so we need the following
+ * #if to exclude the ESI code from compile process when not needed.
+ */
+#if (USE_SQUID_ESI == 1)
+
 #include "ESISequence.h"
 #include "ESILiteral.h"
 #include "ESIAttempt.h"
@@ -392,3 +398,4 @@ esiSequence::makeUsable(esiTreeParentPtr newParent, ESIVarState &newVarState) co
     return result;
 }
 
+#endif /* USE_SQUID_ESI == 1 */

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index 7fa16a8d6bfb3308918fc988399888bacda3ec6d..3f280e1b495c67ea55d59fc7e2bfc7851fa31b56 100644 (file)
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns_internal.cc,v 1.104 2008/01/11 03:49:22 amosjeffries Exp $
+ * $Id: dns_internal.cc,v 1.105 2008/01/20 19:46:35 serassio Exp $
  *
  * DEBUG: section 78    DNS lookups; interacts with lib/rfc1035.c
  * AUTHOR: Duane Wessels
@@ -51,7 +51,7 @@
 #include <resolv.h>
 #endif
 
-/* MS VisualStudio Projects are monolithic, so we need the following
+/* MS Visual Studio Projects are monolithic, so we need the following
    #ifndef to exclude the internal DNS code from compile process when
    using external DNS process.
  */

diff --git a/src/ssl_support.cc b/src/ssl_support.cc
index 3267df06a50177366a0e697781774c7383aaa606..bd89da38841142a98133622ef0bf4e013aa230cb 100644 (file)
--- a/src/ssl_support.cc
+++ b/src/ssl_support.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ssl_support.cc,v 1.35 2007/04/28 22:26:37 hno Exp $
+ * $Id: ssl_support.cc,v 1.36 2008/01/20 19:46:35 serassio Exp $
  *
  * AUTHOR: Benno Rice
  * DEBUG: section 83    SSL accelerator support
@@ -34,6 +34,12 @@
  */
 
 #include "squid.h"
+
+/* MS Visual Studio Projects are monolithic, so we need the following
+ * #if to exclude the SSL code from compile process when not needed.
+ */
+#if USE_SSL
+
 #include "fde.h"
 
 static int
@@ -1058,3 +1064,5 @@ sslGetUserCertificateChainPEM(SSL *ssl)
 
     return str;
 }
+
+#endif /* USE_SSL */