CREATE_CBDATA moved back to cbdata.c. It is and should only be used from

there.

diff --git a/src/cbdata.cc b/src/cbdata.cc
index 9e0bacc00c86624081c34fa623bc79139d486954..f6ea50eed2faec163403fbc8383863957b1f9061 100644 (file)
--- a/src/cbdata.cc
+++ b/src/cbdata.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cbdata.cc,v 1.32 2001/01/05 09:51:36 adrian Exp $
+ * $Id: cbdata.cc,v 1.33 2001/01/06 11:14:42 hno Exp $
  *
  * DEBUG: section 45    Callback Data Registry
  * ORIGINAL AUTHOR: Duane Wessels
@@ -127,9 +127,7 @@ cbdataInit(void)
     cachemgrRegister("cbdata",
        "Callback Data Registry Contents",
        cbdataDump, 0, 1);
-/* TEMPORARILY DEFINED IN squid.h
- * #define CREATE_CBDATA(type) cbdataInitType(CBDATA_##type, #type, sizeof(type))
- */
+#define CREATE_CBDATA(type) cbdataInitType(CBDATA_##type, #type, sizeof(type))
     CREATE_CBDATA(acl_access);
     CREATE_CBDATA(aclCheck_t);
     CREATE_CBDATA(clientHttpRequest);

diff --git a/src/squid.h b/src/squid.h
index 94932deb87168d5f1aef3bdb965f2a6a9d3e39d0..e3ef126fcb82c5ecf083192c07cf1a4bfefa2fb1 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.207 2001/01/05 09:51:40 adrian Exp $
+ * $Id: squid.h,v 1.208 2001/01/06 11:14:42 hno Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -432,4 +432,3 @@ struct rusage {
 #define INDEXSD(i)   (&Config.cacheSwap.swapDirs[(i)])
 
 #endif /* SQUID_H */
-#define CREATE_CBDATA(type) cbdataInitType(CBDATA_##type, #type, sizeof(type))