From: robertc <>
Date: Mon, 14 Jul 2003 14:21:56 +0000 (+0000)
Subject: Summary: MSVC Compatability.
X-Git-Tag: SQUID_3_0_PRE1~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf5113eb698f08c0e61c6fef4f8d4ee4d42aa4f1;p=thirdparty%2Fsquid.git

Summary: MSVC Compatability.
Keywords:

Don't use inline static initialiser in cbdata.
MSVC Doesn't like
  Foo *Class::Static(NULL);
 convert to
  Foo (*Class::Static)(NULL);
 throughout.
---

diff --git a/src/ACLARP.cc b/src/ACLARP.cc
index 3327c55272..0f9b1a55f8 100644
--- a/src/ACLARP.cc
+++ b/src/ACLARP.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLARP.cc,v 1.2 2003/03/01 11:04:45 hno Exp $
+ * $Id: ACLARP.cc,v 1.3 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -84,7 +84,7 @@ ACLARP::ACLARP (ACLARP const & old) : data (NULL), class_ (old.class_)
     assert (!old.data);
 }
 
-MemPool *ACLARP::Pool(NULL);
+MemPool (*ACLARP::Pool)(NULL);
 void *
 ACLARP::operator new (size_t byteCount)
 {
diff --git a/src/ACLCertificateData.cc b/src/ACLCertificateData.cc
index 8554e048ee..08405de394 100644
--- a/src/ACLCertificateData.cc
+++ b/src/ACLCertificateData.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLCertificateData.cc,v 1.4 2003/02/25 12:16:55 robertc Exp $
+ * $Id: ACLCertificateData.cc,v 1.5 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -39,7 +39,7 @@
 #include "authenticate.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLCertificateData::Pool(NULL);
+MemPool (*ACLCertificateData::Pool)(NULL);
 void *
 ACLCertificateData::operator new (size_t byteCount)
 {
diff --git a/src/ACLDestinationDomain.cc b/src/ACLDestinationDomain.cc
index 5dc355a6a1..86f094b73b 100644
--- a/src/ACLDestinationDomain.cc
+++ b/src/ACLDestinationDomain.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLDestinationDomain.cc,v 1.4 2003/07/11 01:40:34 robertc Exp $
+ * $Id: ACLDestinationDomain.cc,v 1.5 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -42,7 +42,7 @@
 #include "ACLDomainData.h"
 #include "HttpRequest.h"
 
-MemPool *ACLDestinationDomain::Pool(NULL);
+MemPool (*ACLDestinationDomain::Pool)(NULL);
 void *
 ACLDestinationDomain::operator new (size_t byteCount)
 {
diff --git a/src/ACLDestinationIP.cc b/src/ACLDestinationIP.cc
index e48af21936..5456f8fe7e 100644
--- a/src/ACLDestinationIP.cc
+++ b/src/ACLDestinationIP.cc
@@ -38,7 +38,7 @@
 #include "ACLChecklist.h"
 #include "HttpRequest.h"
 
-MemPool *ACLDestinationIP::Pool(NULL);
+MemPool (*ACLDestinationIP::Pool)(NULL);
 void *
 ACLDestinationIP::operator new (size_t byteCount)
 {
diff --git a/src/ACLDomainData.cc b/src/ACLDomainData.cc
index 0968cfa952..3e42bfc1f7 100644
--- a/src/ACLDomainData.cc
+++ b/src/ACLDomainData.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLDomainData.cc,v 1.3 2003/02/21 22:50:04 robertc Exp $
+ * $Id: ACLDomainData.cc,v 1.4 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -39,7 +39,7 @@
 #include "authenticate.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLDomainData::Pool(NULL);
+MemPool (*ACLDomainData::Pool)(NULL);
 void *
 ACLDomainData::operator new (size_t byteCount)
 {
diff --git a/src/ACLExtUser.cc b/src/ACLExtUser.cc
index 718b008a79..b15b6cdd0c 100644
--- a/src/ACLExtUser.cc
+++ b/src/ACLExtUser.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLExtUser.cc,v 1.2 2003/07/11 01:40:34 robertc Exp $
+ * $Id: ACLExtUser.cc,v 1.3 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -43,7 +43,7 @@
 #include "client_side.h"
 #include "HttpRequest.h"
 
-MemPool *ACLExtUser::Pool(NULL);
+MemPool (*ACLExtUser::Pool)(NULL);
 void *
 ACLExtUser::operator new (size_t byteCount)
 {
diff --git a/src/ACLIP.cc b/src/ACLIP.cc
index 20e2413a37..2778a13fd2 100644
--- a/src/ACLIP.cc
+++ b/src/ACLIP.cc
@@ -399,7 +399,7 @@ ACLIP::match(struct in_addr &clientip)
     return !splayLastResult;
 }
 
-MemPool *acl_ip_data::Pool(NULL);
+MemPool (*acl_ip_data::Pool)(NULL);
 void *
 acl_ip_data::operator new (size_t byteCount)
 {
diff --git a/src/ACLIdent.cc b/src/ACLIdent.cc
index 5b031a2c9b..787c2ea326 100644
--- a/src/ACLIdent.cc
+++ b/src/ACLIdent.cc
@@ -42,7 +42,7 @@
 #include "ACLUserData.h"
 #include "client_side.h"
 
-MemPool *ACLIdent::Pool(NULL);
+MemPool (*ACLIdent::Pool)(NULL);
 void *
 ACLIdent::operator new (size_t byteCount)
 {
diff --git a/src/ACLMaxConnection.cc b/src/ACLMaxConnection.cc
index 7d1042c1fb..496ff39c76 100644
--- a/src/ACLMaxConnection.cc
+++ b/src/ACLMaxConnection.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLMaxConnection.cc,v 1.1 2003/02/25 12:16:55 robertc Exp $
+ * $Id: ACLMaxConnection.cc,v 1.2 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -53,7 +53,7 @@ ACLMaxConnection::ACLMaxConnection (char const *theClass) : class_ (theClass), l
 ACLMaxConnection::ACLMaxConnection (ACLMaxConnection const & old) :class_ (old.class_), limit (old.limit)
 {}
 
-MemPool *ACLMaxConnection::Pool(NULL);
+MemPool (*ACLMaxConnection::Pool)(NULL);
 void *
 ACLMaxConnection::operator new (size_t byteCount)
 {
diff --git a/src/ACLMaxUserIP.cc b/src/ACLMaxUserIP.cc
index 842132e68c..0e5203db21 100644
--- a/src/ACLMaxUserIP.cc
+++ b/src/ACLMaxUserIP.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLMaxUserIP.cc,v 1.2 2003/03/10 20:12:43 robertc Exp $
+ * $Id: ACLMaxUserIP.cc,v 1.3 2003/07/14 08:21:57 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -54,7 +54,7 @@ ACLMaxUserIP::ACLMaxUserIP (char const *theClass) : class_ (theClass), maximum(0
 ACLMaxUserIP::ACLMaxUserIP (ACLMaxUserIP const & old) :class_ (old.class_), maximum (old.maximum), flags (old.flags)
 {}
 
-MemPool *ACLMaxUserIP::Pool(NULL);
+MemPool (*ACLMaxUserIP::Pool)(NULL);
 void *
 ACLMaxUserIP::operator new (size_t byteCount)
 {
diff --git a/src/ACLMethodData.cc b/src/ACLMethodData.cc
index 32a78d801a..279373bee9 100644
--- a/src/ACLMethodData.cc
+++ b/src/ACLMethodData.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLMethodData.cc,v 1.1 2003/02/25 12:16:55 robertc Exp $
+ * $Id: ACLMethodData.cc,v 1.2 2003/07/14 08:21:57 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -38,7 +38,7 @@
 #include "ACLMethodData.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLMethodData::Pool(NULL);
+MemPool (*ACLMethodData::Pool)(NULL);
 void *
 ACLMethodData::operator new (size_t byteCount)
 {
diff --git a/src/ACLMyIP.cc b/src/ACLMyIP.cc
index d41d16ebe9..d0bec2a23a 100644
--- a/src/ACLMyIP.cc
+++ b/src/ACLMyIP.cc
@@ -37,7 +37,7 @@
 #include "ACLMyIP.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLMyIP::Pool(NULL);
+MemPool (*ACLMyIP::Pool)(NULL);
 void *
 ACLMyIP::operator new (size_t byteCount)
 {
diff --git a/src/ACLProtocolData.cc b/src/ACLProtocolData.cc
index a0053053f6..fdde7115b1 100644
--- a/src/ACLProtocolData.cc
+++ b/src/ACLProtocolData.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLProtocolData.cc,v 1.1 2003/02/25 12:16:55 robertc Exp $
+ * $Id: ACLProtocolData.cc,v 1.2 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -38,7 +38,7 @@
 #include "ACLProtocolData.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLProtocolData::Pool(NULL);
+MemPool (*ACLProtocolData::Pool)(NULL);
 void *
 ACLProtocolData::operator new (size_t byteCount)
 {
diff --git a/src/ACLProxyAuth.cc b/src/ACLProxyAuth.cc
index ba5f8dc9f8..0b3395149c 100644
--- a/src/ACLProxyAuth.cc
+++ b/src/ACLProxyAuth.cc
@@ -43,7 +43,7 @@
 #include "client_side.h"
 #include "HttpRequest.h"
 
-MemPool *ACLProxyAuth::Pool(NULL);
+MemPool (*ACLProxyAuth::Pool)(NULL);
 void *
 ACLProxyAuth::operator new (size_t byteCount)
 {
diff --git a/src/ACLRegexData.cc b/src/ACLRegexData.cc
index 0084566efe..64c703c200 100644
--- a/src/ACLRegexData.cc
+++ b/src/ACLRegexData.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLRegexData.cc,v 1.4 2003/02/25 12:16:55 robertc Exp $
+ * $Id: ACLRegexData.cc,v 1.5 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -40,7 +40,7 @@
 #include "ACLChecklist.h"
 #include "ACL.h"
 
-MemPool *ACLRegexData::Pool(NULL);
+MemPool (*ACLRegexData::Pool)(NULL);
 void *
 ACLRegexData::operator new (size_t byteCount)
 {
diff --git a/src/ACLReplyHeaderStrategy.h b/src/ACLReplyHeaderStrategy.h
index f4d6bd6724..03bda90351 100644
--- a/src/ACLReplyHeaderStrategy.h
+++ b/src/ACLReplyHeaderStrategy.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLReplyHeaderStrategy.h,v 1.2 2003/06/19 13:12:01 robertc Exp $
+ * $Id: ACLReplyHeaderStrategy.h,v 1.3 2003/07/14 08:21:56 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -84,6 +84,6 @@ ACLReplyHeaderStrategy<header>::Instance()
 }
 
 template <http_hdr_type header>
-ACLReplyHeaderStrategy<header> * ACLReplyHeaderStrategy<header>::Instance_(NULL);
+ACLReplyHeaderStrategy<header> (* ACLReplyHeaderStrategy<header>::Instance_)(NULL);
 
 #endif /* SQUID_REPLYHEADERSTRATEGY_H */
diff --git a/src/ACLRequestHeaderStrategy.h b/src/ACLRequestHeaderStrategy.h
index 176ec817d8..5d418c30c0 100644
--- a/src/ACLRequestHeaderStrategy.h
+++ b/src/ACLRequestHeaderStrategy.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLRequestHeaderStrategy.h,v 1.5 2003/07/11 01:40:33 robertc Exp $
+ * $Id: ACLRequestHeaderStrategy.h,v 1.6 2003/07/14 08:21:56 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -85,6 +85,6 @@ ACLRequestHeaderStrategy<header>::Instance()
 }
 
 template <http_hdr_type header>
-ACLRequestHeaderStrategy<header> * ACLRequestHeaderStrategy<header>::Instance_ (NULL);
+ACLRequestHeaderStrategy<header> (* ACLRequestHeaderStrategy<header>::Instance_) (NULL);
 
 #endif /* SQUID_REQUESTHEADERSTRATEGY_H */
diff --git a/src/ACLSourceIP.cc b/src/ACLSourceIP.cc
index 09cc20ba7f..1c9b1867e1 100644
--- a/src/ACLSourceIP.cc
+++ b/src/ACLSourceIP.cc
@@ -37,7 +37,7 @@
 #include "ACLSourceIP.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLSourceIP::Pool(NULL);
+MemPool (*ACLSourceIP::Pool)(NULL);
 void *
 ACLSourceIP::operator new (size_t byteCount)
 {
diff --git a/src/ACLStrategised.h b/src/ACLStrategised.h
index eabb0516f3..34538f12c3 100644
--- a/src/ACLStrategised.h
+++ b/src/ACLStrategised.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLStrategised.h,v 1.3 2003/02/25 12:22:34 robertc Exp $
+ * $Id: ACLStrategised.h,v 1.4 2003/07/14 08:21:56 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -77,7 +77,7 @@ private:
 /* implementation follows */
 
 template <class MatchType>
-MemPool *ACLStrategised<MatchType>::Pool(NULL);
+MemPool (*ACLStrategised<MatchType>::Pool)(NULL);
 
 template <class MatchType>
 void *
diff --git a/src/ACLStringData.cc b/src/ACLStringData.cc
index 16ac6a1eff..33e0112572 100644
--- a/src/ACLStringData.cc
+++ b/src/ACLStringData.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLStringData.cc,v 1.1 2003/02/25 12:16:55 robertc Exp $
+ * $Id: ACLStringData.cc,v 1.2 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -38,7 +38,7 @@
 #include "ACLStringData.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLStringData::Pool(NULL);
+MemPool (*ACLStringData::Pool)(NULL);
 void *
 ACLStringData::operator new (size_t byteCount)
 {
diff --git a/src/ACLTimeData.cc b/src/ACLTimeData.cc
index c02542725b..c87c2d2c77 100644
--- a/src/ACLTimeData.cc
+++ b/src/ACLTimeData.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: ACLTimeData.cc,v 1.2 2003/02/21 22:50:04 robertc Exp $
+ * $Id: ACLTimeData.cc,v 1.3 2003/07/14 08:21:57 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -39,7 +39,7 @@
 #include "authenticate.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLTimeData::Pool(NULL);
+MemPool (*ACLTimeData::Pool)(NULL);
 void *
 ACLTimeData::operator new (size_t byteCount)
 {
diff --git a/src/ACLUserData.cc b/src/ACLUserData.cc
index 567edb8f3b..2617d0f0d7 100644
--- a/src/ACLUserData.cc
+++ b/src/ACLUserData.cc
@@ -39,7 +39,7 @@
 #include "authenticate.h"
 #include "ACLChecklist.h"
 
-MemPool *ACLUserData::Pool(NULL);
+MemPool (*ACLUserData::Pool)(NULL);
 void *
 ACLUserData::operator new (size_t byteCount)
 {
diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 72ff8a9926..d3b1b85cbc 100644
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpHeader.cc,v 1.90 2003/07/10 17:48:04 hno Exp $
+ * $Id: HttpHeader.cc,v 1.91 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 55    HTTP Header
  * AUTHOR: Alex Rousskov
@@ -1452,7 +1452,7 @@ httpHeaderNameById(int id)
     return HeadersAttrs[id].name;
 }
 
-MemPool *HttpHeaderEntry::Pool(NULL);
+MemPool (*HttpHeaderEntry::Pool)(NULL);
 void *
 HttpHeaderEntry::operator new (size_t byteCount)
 {
diff --git a/src/HttpReply.cc b/src/HttpReply.cc
index 6f5a691b35..3ae0b07383 100644
--- a/src/HttpReply.cc
+++ b/src/HttpReply.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpReply.cc,v 1.60 2003/05/11 13:53:03 hno Exp $
+ * $Id: HttpReply.cc,v 1.61 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 58    HTTP Reply (Response)
  * AUTHOR: Alex Rousskov
@@ -599,7 +599,7 @@ httpReplyBodySize(method_t method, HttpReply const * reply)
     return reply->content_length;
 }
 
-MemPool *HttpReply::Pool(NULL);
+MemPool (*HttpReply::Pool)(NULL);
 void *
 HttpReply::operator new (size_t byteCount)
 {
diff --git a/src/acl.cc b/src/acl.cc
index f487e0ce02..3757652053 100644
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl.cc,v 1.307 2003/05/17 17:35:05 hno Exp $
+ * $Id: acl.cc,v 1.308 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -668,7 +668,7 @@ acl_access::containsPURGE() const
 
 /* to be split into separate files in the future */
 
-MemPool *ACLList::Pool(NULL);
+MemPool (*ACLList::Pool)(NULL);
 void *
 ACLList::operator new (size_t byteCount)
 {
diff --git a/src/asn.cc b/src/asn.cc
index 1a787fdfc5..0751f55ef7 100644
--- a/src/asn.cc
+++ b/src/asn.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: asn.cc,v 1.93 2003/06/19 13:12:04 robertc Exp $
+ * $Id: asn.cc,v 1.94 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 53    AS Number handling
  * AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -547,7 +547,7 @@ printRadixNode(struct squid_radix_node *rn, void *_sentry)
     return 0;
 }
 
-MemPool *ACLASN::Pool(NULL);
+MemPool (*ACLASN::Pool)(NULL);
 void *
 ACLASN::operator new (size_t byteCount)
 {
diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index efc27dc5f9..250af3be4e 100644
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_digest.cc,v 1.25 2003/07/11 01:40:41 robertc Exp $
+ * $Id: auth_digest.cc,v 1.26 2003/07/14 08:22:01 robertc Exp $
  *
  * DEBUG: section 29    Authenticator
  * AUTHOR: Robert Collins
@@ -1509,7 +1509,7 @@ authenticateDigestStart(auth_user_request_t * auth_user_request, RH * handler, v
 }
 
 
-MemPool *digest_user_h::Pool(NULL);
+MemPool (*digest_user_h::Pool)(NULL);
 void *
 digest_user_h::operator new (size_t byteCount)
 {
@@ -1537,7 +1537,7 @@ digest_user_h::deleteSelf() const
 digest_user_h::digest_user_h () : username (NULL), HA1created (0)
 {}
 
-MemPool *digest_request_h::Pool(NULL);
+MemPool (*digest_request_h::Pool)(NULL);
 void *
 digest_request_h::operator new (size_t byteCount)
 {
diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index 61589d54d3..27be1f31ae 100644
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_ntlm.cc,v 1.32 2003/07/11 01:40:42 robertc Exp $
+ * $Id: auth_ntlm.cc,v 1.33 2003/07/14 08:21:58 robertc Exp $
  *
  * DEBUG: section 29    NTLM Authenticator
  * AUTHOR: Robert Collins
@@ -1235,7 +1235,7 @@ authenticateNTLMAuthenticateUser(auth_user_request_t * auth_user_request, reques
     return;
 }
 
-MemPool *ntlm_request_t::Pool(NULL);
+MemPool (*ntlm_request_t::Pool)(NULL);
 void *
 ntlm_request_t::operator new (size_t byteCount)
 {
diff --git a/src/cbdata.cc b/src/cbdata.cc
index 46715e7c6f..be884aa270 100644
--- a/src/cbdata.cc
+++ b/src/cbdata.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cbdata.cc,v 1.56 2003/03/10 04:56:36 robertc Exp $
+ * $Id: cbdata.cc,v 1.57 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 45    Callback Data Registry
  * ORIGINAL AUTHOR: Duane Wessels
@@ -111,11 +111,12 @@ void check() const { assert(cookie == ((long)this ^ Cookie));}
 
     size_t dataSize() const { return sizeof(data);}
 
-    static const long Cookie = (long)0xDEADBEEF;
+    static const long Cookie;
     static long MakeOffset();
     static const long Offset;
 };
 
+const long cbdata::Cookie((long)0xDEADBEEF);
 const long cbdata::Offset(MakeOffset());
 
 long
diff --git a/src/comm.cc b/src/comm.cc
index 18b0e63638..efe8dedde8 100644
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.381 2003/07/10 01:31:50 robertc Exp $
+ * $Id: comm.cc,v 1.382 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -317,7 +317,7 @@ dlink_list CommCallbackList;
 
 /* New and improved stuff */
 
-MemPool *CommCallbackData::Pool(NULL);
+MemPool (*CommCallbackData::Pool)(NULL);
 void *
 CommCallbackData::operator new (size_t byteCount)
 {
@@ -342,7 +342,7 @@ CommCallbackData::deleteSelf() const
     delete this;
 }
 
-MemPool *CommReadCallbackData::Pool(NULL);
+MemPool (*CommReadCallbackData::Pool)(NULL);
 void *
 CommReadCallbackData::operator new (size_t byteCount)
 {
@@ -367,7 +367,7 @@ CommReadCallbackData::deleteSelf() const
     delete this;
 }
 
-MemPool *CommAcceptCallbackData::Pool(NULL);
+MemPool (*CommAcceptCallbackData::Pool)(NULL);
 void *
 CommAcceptCallbackData::operator new (size_t byteCount)
 {
@@ -392,7 +392,7 @@ CommAcceptCallbackData::deleteSelf() const
     delete this;
 }
 
-MemPool *CommFillCallbackData::Pool(NULL);
+MemPool (*CommFillCallbackData::Pool)(NULL);
 void *
 CommFillCallbackData::operator new (size_t byteCount)
 {
@@ -418,7 +418,7 @@ CommFillCallbackData::deleteSelf() const
 }
 
 
-MemPool *CommWriteCallbackData::Pool(NULL);
+MemPool (*CommWriteCallbackData::Pool)(NULL);
 void *
 CommWriteCallbackData::operator new (size_t byteCount)
 {
diff --git a/src/debug.cc b/src/debug.cc
index 9e101b36fd..8c03eacc03 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: debug.cc,v 1.94 2003/07/11 04:55:40 robertc Exp $
+ * $Id: debug.cc,v 1.95 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 0     Debug Routines
  * AUTHOR: Harvest Derived
@@ -537,4 +537,4 @@ Debug::finishDebug() {
     CurrentDebug = NULL;
 }
 
-std::ostringstream *Debug::CurrentDebug = NULL;
+std::ostringstream (*Debug::CurrentDebug)(NULL);
diff --git a/src/external_acl.cc b/src/external_acl.cc
index 662a9af1ba..84d4cb0992 100644
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: external_acl.cc,v 1.50 2003/07/13 23:00:09 robertc Exp $
+ * $Id: external_acl.cc,v 1.51 2003/07/14 08:21:56 robertc Exp $
  *
  * DEBUG: section 82    External ACL
  * AUTHOR: Henrik Nordstrom, MARA Systems AB
@@ -1231,7 +1231,7 @@ ACLExternal::ACLExternal (ACLExternal const & old) : data (NULL), class_ (old.cl
     assert (!old.data);
 }
 
-MemPool *ACLExternal::Pool(NULL);
+MemPool (*ACLExternal::Pool)(NULL);
 void *
 ACLExternal::operator new (size_t byteCount)
 {