Index: dns.cc =================================================================== RCS file: /cvsroot/squid/squid3/src/dns.cc,v retrieving revision 1.5 diff -u -p -r1.5 dns.cc --- dns.cc 22 Feb 2003 03:14:33 -0000 1.5 +++ dns.cc 8 Mar 2003 11:06:09 -0000 @@ -36,6 +36,11 @@ #include "squid.h" #include "Store.h" +/* MS VisualStudio Projects are monolitich, so we need the following + #if to include the external DNS code in compile process when + using external DNS. + */ +#if USE_DNSSERVERS static helper *dnsservers = NULL; static void @@ -167,3 +172,4 @@ snmp_netDnsFn(variable_list * Var, snint } #endif /*SQUID_SNMP */ +#endif /* USE_DNSSERVERS */ Index: dns_internal.cc =================================================================== RCS file: /cvsroot/squid/squid3/src/dns_internal.cc,v retrieving revision 1.9 diff -u -p -r1.9 dns_internal.cc --- dns_internal.cc 3 Mar 2003 03:13:50 -0000 1.9 +++ dns_internal.cc 8 Mar 2003 11:06:09 -0000 @@ -37,6 +37,11 @@ #include "Store.h" #include "comm.h" +/* MS VisualStudio Projects are monolitich, so we need the following + #ifndef to exclude the internal DNS code from compile process when + using external DNS process. + */ +#ifndef USE_DNSSERVERS #if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) #include #endif @@ -91,7 +96,9 @@ static OBJH idnsStats; static void idnsAddNameserver(const char *buf); static void idnsFreeNameservers(void); static void idnsParseNameservers(void); +#ifndef _SQUID_MSWIN_ static void idnsParseResolvConf(void); +#endif #if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) static void idnsParseWIN32Registry(void); #endif @@ -167,6 +174,7 @@ idnsParseNameservers(void) } } +#ifndef _SQUID_MSWIN_ static void idnsParseResolvConf(void) { @@ -180,7 +188,7 @@ idnsParseResolvConf(void) return; } -#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) +#if defined(_SQUID_CYGWIN_) setmode(fileno(fp), O_TEXT); #endif @@ -207,6 +215,8 @@ idnsParseResolvConf(void) fclose(fp); } +#endif + #if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) static void idnsParseWIN32Registry(void) @@ -917,3 +927,4 @@ snmp_netIdnsFn(variable_list * Var, snin } #endif /*SQUID_SNMP */ +#endif /* USE_DNSSERVERS */