From: hno <> Date: Sat, 30 Mar 2002 23:29:51 +0000 (+0000) Subject: Minor WIN32 cleanups from Guido X-Git-Tag: SQUID_3_0_PRE1~1159 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa2bfbabb705bdb348e89f09e2f77e62424faee9;p=thirdparty%2Fsquid.git Minor WIN32 cleanups from Guido --- diff --git a/src/globals.h b/src/globals.h index f67ac28f5e..0b0c55ac33 100644 --- a/src/globals.h +++ b/src/globals.h @@ -1,6 +1,6 @@ /* - * $Id: globals.h,v 1.108 2001/10/17 20:25:02 hno Exp $ + * $Id: globals.h,v 1.109 2002/03/30 16:29:51 hno Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -159,7 +159,7 @@ extern hash_table *proxy_auth_username_cache; /* NULL */ extern int incoming_sockets_accepted; #if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) extern unsigned int WIN32_OS_version; /* 0 */ -extern char *WIN32_OS_string; +extern char *WIN32_OS_string; /* NULL */ #endif #endif /* SQUID_GLOBALS_H */ diff --git a/src/tools.cc b/src/tools.cc index 6106f79427..083a0c69c0 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -1,6 +1,6 @@ /* - * $Id: tools.cc,v 1.213 2001/11/17 11:09:25 hno Exp $ + * $Id: tools.cc,v 1.214 2002/03/30 16:29:51 hno Exp $ * * DEBUG: section 21 Misc Functions * AUTHOR: Harvest Derived @@ -966,9 +966,7 @@ parseEtcHosts(void) char buf2[512]; char *nt = buf; char *lt = buf; -#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) - char *systemroot = NULL; -#endif + if (NULL == Config.etcHostsPath) return; if (0 == strcmp(Config.etcHostsPath, "none"))