---------------------
PatchSet 6155 
Date: 2007/11/20 15:30:21
Author: rousskov
Branch: ecap
Tag: (none) 
Log:
When USE_ECAP_AS_ICAP_HACK macro is defined, enable a temporary hack that uses
ICAP class names to implement some of the eCAP classes. This is necessary to
hide eCAP/ICAP distinction from Squid core. Hiding the distinction is
necessary to avoid numerous conflicts when this branch is merged with async
call branch changes.

Once the branches are merged, the hack will be removed. Since we currently
#define eCAP class names to match those of ICAP classes, the changes at that
time should not be significant: remove renaming #defines and adjust autotools
meta files to allow both ICAP and eCAP co-exist.

Members: 
	src/ICAP/ICAPModXact.h:1.9->1.9.2.1 
	src/ICAP/ICAPServiceRep.h:1.11->1.11.2.1 

Index: squid3/src/ICAP/ICAPModXact.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPModXact.h,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- squid3/src/ICAP/ICAPModXact.h	13 Aug 2007 17:24:17 -0000	1.9
+++ squid3/src/ICAP/ICAPModXact.h	20 Nov 2007 15:30:21 -0000	1.9.2.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPModXact.h,v 1.9 2007/08/13 17:24:17 squidadm Exp $
+ * $Id: ICAPModXact.h,v 1.9.2.1 2007/11/20 15:30:21 rousskov Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -34,6 +34,10 @@
 #ifndef SQUID_ICAPMODXACT_H
 #define SQUID_ICAPMODXACT_H
 
+#if USE_ECAP_AS_ICAP_HACK
+#include "eCAP/Xaction.h"
+#else
+
 #include "BodyPipe.h"
 #include "ICAPXaction.h"
 #include "ICAPInOut.h"
@@ -323,4 +327,6 @@
     CBDATA_CLASS2(ICAPModXactLauncher);
 };
 
+#endif /* USE_ECAP_AS_ICAP_HACK */
+
 #endif /* SQUID_ICAPMOD_XACT_H */
Index: squid3/src/ICAP/ICAPServiceRep.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPServiceRep.h,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- squid3/src/ICAP/ICAPServiceRep.h	24 Jul 2007 16:51:08 -0000	1.11
+++ squid3/src/ICAP/ICAPServiceRep.h	20 Nov 2007 15:30:22 -0000	1.11.2.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPServiceRep.h,v 1.11 2007/07/24 16:51:08 squidadm Exp $
+ * $Id: ICAPServiceRep.h,v 1.11.2.1 2007/11/20 15:30:22 rousskov Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -34,6 +34,10 @@
 #ifndef SQUID_ICAPSERVICEREP_H
 #define SQUID_ICAPSERVICEREP_H
 
+#if USE_ECAP_AS_ICAP_HACK
+#include "eCAP/ServiceRep.h"
+#else
+
 #include "cbdata.h"
 #include "ICAPInitiator.h"
 #include "ICAPElements.h"
@@ -173,5 +177,6 @@
     CBDATA_CLASS2(ICAPServiceRep);
 };
 
+#endif /* USE_ECAP_AS_ICAP_HACK */
 
 #endif /* SQUID_ICAPSERVICEREP_H */