From: robertc <> Date: Sun, 10 Aug 2003 15:53:49 +0000 (+0000) Subject: Summary: Fixup remaining MSVC issues. X-Git-Tag: SQUID_3_0_PRE3~25 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=edb9bfd53cbe58b9f7137ca06dd47162378a6dea;p=thirdparty%2Fsquid.git Summary: Fixup remaining MSVC issues. Keywords: Addresses - protos.h: c:\work\nt-3.0\src\protos.h(443) : warning C4190: '' has C-linkage specified, but returns UDT 'String' which is incompatible with C c:\work\nt-3.0\src\squidstring.h(77) : see declaration of 'String' c:\work\nt-3.0\src\protos.h(444) : warning C4190: '' has C-linkage specified, but returns UDT 'String' which is incompatible with C c:\work\nt-3.0\src\squidstring.h(77) : see declaration of 'String' c:\work\nt-3.0\src\protos.h(445) : warning C4190: '' has C-linkage specified, but returns UDT 'String' which is incompatible with C c:\work\nt-3.0\src\squidstring.h(77) : see declaration of 'String' c:\work\nt-3.0\src\protos.h(446) : warning C4190: '' has C-linkage specified, but returns UDT 'String' which is incompatible with C c:\work\nt-3.0\src\squidstring.h(77) : see declaration of 'String' c:\work\nt-3.0\src\protos.h(447) : warning C4190: '' has C-linkage specified, but returns UDT 'String' which is incompatible with C c:\work\nt-3.0\src\squidstring.h(77) : see declaration of 'String' protos.h: c:\work\nt-3.0\src\protos.h(740) : error C2526: 'storeCreate' : C linkage function cannot return C++ class 'RefCount' c:\work\nt-3.0\src\protos.h(741) : error C2526: 'storeOpen' : C linkage function cannot return C++ class 'RefCount' typedefs.h: c:\work\nt-3.0\src\httprequest.h(56) : warning C4099: 'HttpRequest' : type name first seen using 'struct' now seen using 'class' c:\work\nt-3.0\src\typedefs.h(202) : see declaration of 'HttpRequest' ACLRequestHeaderStrategy.h c:\work\nt-3.0\src\aclrequestheaderstrategy.h(88) : error C2059: syntax error : 'constant' ACLStrategised.h c:\work\nt-3.0\src\aclreplyheaderstrategy.h(88) : error C2059: syntax error : 'constant' ACLReplyHeaderStrategy.h: c:\work\nt-3.0\src\aclreplyheaderstrategy.h(87) : error C2059: syntax error : 'constant' --- diff --git a/src/ACLReplyHeaderStrategy.h b/src/ACLReplyHeaderStrategy.h index 03bda90351..9275244388 100644 --- a/src/ACLReplyHeaderStrategy.h +++ b/src/ACLReplyHeaderStrategy.h @@ -1,6 +1,6 @@ /* - * $Id: ACLReplyHeaderStrategy.h,v 1.3 2003/07/14 08:21:56 robertc Exp $ + * $Id: ACLReplyHeaderStrategy.h,v 1.4 2003/08/10 09:53:49 robertc Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -84,6 +84,6 @@ ACLReplyHeaderStrategy
::Instance() } template -ACLReplyHeaderStrategy
(* ACLReplyHeaderStrategy
::Instance_)(NULL); +ACLReplyHeaderStrategy
* ACLReplyHeaderStrategy
::Instance_ = NULL; #endif /* SQUID_REPLYHEADERSTRATEGY_H */ diff --git a/src/ACLRequestHeaderStrategy.h b/src/ACLRequestHeaderStrategy.h index 5d418c30c0..1d5ab3666d 100644 --- a/src/ACLRequestHeaderStrategy.h +++ b/src/ACLRequestHeaderStrategy.h @@ -1,6 +1,6 @@ /* - * $Id: ACLRequestHeaderStrategy.h,v 1.6 2003/07/14 08:21:56 robertc Exp $ + * $Id: ACLRequestHeaderStrategy.h,v 1.7 2003/08/10 09:53:49 robertc Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -85,6 +85,6 @@ ACLRequestHeaderStrategy
::Instance() } template -ACLRequestHeaderStrategy
(* ACLRequestHeaderStrategy
::Instance_) (NULL); +ACLRequestHeaderStrategy
* ACLRequestHeaderStrategy
::Instance_ = NULL; #endif /* SQUID_REQUESTHEADERSTRATEGY_H */ diff --git a/src/ACLStrategised.h b/src/ACLStrategised.h index e208fa5fde..c98ddfd4e1 100644 --- a/src/ACLStrategised.h +++ b/src/ACLStrategised.h @@ -1,6 +1,6 @@ /* - * $Id: ACLStrategised.h,v 1.5 2003/08/04 22:14:40 robertc Exp $ + * $Id: ACLStrategised.h,v 1.6 2003/08/10 09:53:49 robertc Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -76,7 +76,7 @@ private: /* implementation follows */ template -MemPool (*ACLStrategised::Pool)(NULL); +MemPool *ACLStrategised::Pool = NULL; template void * diff --git a/src/protos.h b/src/protos.h index c530cd9bd8..46f90655fa 100644 --- a/src/protos.h +++ b/src/protos.h @@ -1,6 +1,6 @@ /* - * $Id: protos.h,v 1.488 2003/08/10 05:11:22 robertc Exp $ + * $Id: protos.h,v 1.489 2003/08/10 09:53:49 robertc Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -439,11 +439,11 @@ SQUIDCEXTERN HttpHdrContRange *httpHeaderGetContRange(const HttpHeader * hdr); SQUIDCEXTERN const char *httpHeaderGetStr(const HttpHeader * hdr, http_hdr_type id); SQUIDCEXTERN const char *httpHeaderGetLastStr(const HttpHeader * hdr, http_hdr_type id); SQUIDCEXTERN const char *httpHeaderGetAuth(const HttpHeader * hdr, http_hdr_type id, const char *auth_scheme); -SQUIDCEXTERN String httpHeaderGetList(const HttpHeader * hdr, http_hdr_type id); -SQUIDCEXTERN String httpHeaderGetStrOrList(const HttpHeader * hdr, http_hdr_type id); -SQUIDCEXTERN String httpHeaderGetByName(const HttpHeader * hdr, const char *name); -SQUIDCEXTERN String httpHeaderGetListMember(const HttpHeader * hdr, http_hdr_type id, const char *member, const char separator); -SQUIDCEXTERN String httpHeaderGetByNameListMember(const HttpHeader * hdr, const char *name, const char *member, const char separator); +extern String httpHeaderGetList(const HttpHeader * hdr, http_hdr_type id); +extern String httpHeaderGetStrOrList(const HttpHeader * hdr, http_hdr_type id); +extern String httpHeaderGetByName(const HttpHeader * hdr, const char *name); +extern String httpHeaderGetListMember(const HttpHeader * hdr, http_hdr_type id, const char *member, const char separator); +extern String httpHeaderGetByNameListMember(const HttpHeader * hdr, const char *name, const char *member, const char separator); SQUIDCEXTERN int httpHeaderDelByName(HttpHeader * hdr, const char *name); SQUIDCEXTERN int httpHeaderDelById(HttpHeader * hdr, http_hdr_type id); SQUIDCEXTERN void httpHeaderDelAt(HttpHeader * hdr, HttpHeaderPos pos); @@ -736,8 +736,8 @@ SQUIDCEXTERN void storeReplSetup(void); /* store_io.c */ #include "StoreIOState.h" -SQUIDCEXTERN StoreIOState::Pointer storeCreate(StoreEntry *, STFNCB *, STIOCB *, void *); -SQUIDCEXTERN StoreIOState::Pointer storeOpen(StoreEntry *, STFNCB *, STIOCB *, void *); +extern StoreIOState::Pointer storeCreate(StoreEntry *, STFNCB *, STIOCB *, void *); +extern StoreIOState::Pointer storeOpen(StoreEntry *, STFNCB *, STIOCB *, void *); SQUIDCEXTERN void storeClose(StoreIOState::Pointer); SQUIDCEXTERN void storeRead(StoreIOState::Pointer, char *, size_t, off_t, STRCB *, void *); SQUIDCEXTERN void storeIOWrite(StoreIOState::Pointer, char const *, size_t, off_t, FREE *); diff --git a/src/typedefs.h b/src/typedefs.h index 422d91367a..c201769d9c 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -1,6 +1,6 @@ /* - * $Id: typedefs.h,v 1.168 2003/07/22 15:23:02 robertc Exp $ + * $Id: typedefs.h,v 1.169 2003/08/10 09:53:49 robertc Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -199,7 +199,7 @@ typedef struct _header_mangler header_mangler; typedef struct _body_size body_size; -typedef struct HttpRequest request_t; +class HttpRequest; typedef struct _AccessLogEntry AccessLogEntry;