---------------------
PatchSet 701 
Date: 2003/04/23 17:24:44
Author: serassio
Branch: nt
Tag: (none) 
Log:
Added new _SQUID_WIN32_ define instead of (_SQUID_CYGWIN_)|| (_SQUID_MSWIN_)

Members: 
	include/config.h:1.3.16.1->1.3.16.2 
	src/dns_internal.cc:1.7.2.5->1.7.2.6 
	src/main.cc:1.15.2.8->1.15.2.9 

Index: squid3/include/config.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/include/config.h,v
retrieving revision 1.3.16.1
retrieving revision 1.3.16.2
diff -u -r1.3.16.1 -r1.3.16.2
--- squid3/include/config.h	25 Feb 2003 02:48:30 -0000	1.3.16.1
+++ squid3/include/config.h	23 Apr 2003 17:24:44 -0000	1.3.16.2
@@ -1,5 +1,5 @@
 /*
- * $Id: config.h,v 1.3.16.1 2003/02/25 02:48:30 hno Exp $
+ * $Id: config.h,v 1.3.16.2 2003/04/23 17:24:44 serassio Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -110,9 +110,11 @@
 
 #elif defined(__CYGWIN32__)  || defined(__CYGWIN__)
 #define _SQUID_CYGWIN_
+#define _SQUID_WIN32_
 
 #elif defined(WIN32) || defined(WINNT) || defined(__WIN32__) || defined(__WIN32)
 #define _SQUID_MSWIN_
+#define _SQUID_WIN32_
 #include "squid-mswin.h"
 
 #elif defined(__APPLE__)
Index: squid3/src/dns_internal.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/dns_internal.cc,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- squid3/src/dns_internal.cc	15 Mar 2003 11:11:46 -0000	1.7.2.5
+++ squid3/src/dns_internal.cc	23 Apr 2003 17:24:48 -0000	1.7.2.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns_internal.cc,v 1.7.2.5 2003/03/15 11:11:46 serassio Exp $
+ * $Id: dns_internal.cc,v 1.7.2.6 2003/04/23 17:24:48 serassio Exp $
  *
  * DEBUG: section 78    DNS lookups; interacts with lib/rfc1035.c
  * AUTHOR: Duane Wessels
@@ -42,7 +42,7 @@
    using external DNS process.
  */
 #ifndef USE_DNSSERVERS
-#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
+#ifdef _SQUID_WIN32_
 #include "squid_windows.h"
 #endif
 #ifndef _PATH_RESOLV_CONF
@@ -99,7 +99,7 @@
 #ifndef _SQUID_MSWIN_
 static void idnsParseResolvConf(void);
 #endif
-#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
+#ifdef _SQUID_WIN32_
 static void idnsParseWIN32Registry(void);
 #endif
 static void idnsSendQuery(idns_query * q);
@@ -217,7 +217,7 @@
 
 #endif
 
-#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
+#ifdef _SQUID_WIN32_
 static void
 idnsParseWIN32Registry(void)
 {
@@ -798,7 +798,7 @@
         idnsParseResolvConf();
 
 #endif
-#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
+#ifdef _SQUID_WIN32_
 
     if (0 == nns)
         idnsParseWIN32Registry();
@@ -807,7 +807,7 @@
 
     if (0 == nns)
         fatal("Could not find any nameservers.\n"
-#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
+#ifdef _SQUID_WIN32_
               "       Please check your TCP-IP settings or /etc/resolv.conf file\n"
 #else
               "       Please check your /etc/resolv.conf file\n"
Index: squid3/src/main.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/main.cc,v
retrieving revision 1.15.2.8
retrieving revision 1.15.2.9
diff -u -r1.15.2.8 -r1.15.2.9
--- squid3/src/main.cc	22 Apr 2003 19:16:24 -0000	1.15.2.8
+++ squid3/src/main.cc	23 Apr 2003 17:24:49 -0000	1.15.2.9
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.15.2.8 2003/04/22 19:16:24 serassio Exp $
+ * $Id: main.cc,v 1.15.2.9 2003/04/23 17:24:49 serassio Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -677,7 +677,7 @@
                  version_string,
                  CONFIG_HOST_TYPE);
 
-#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
+#ifdef _SQUID_WIN32_
 
     if (WIN32_run_mode == _WIN_SQUID_RUN_MODE_SERVICE) {
         debug(1, 0) ("Running as %s Windows System Service on %s\n", WIN32_Service_name, WIN32_OS_string);
@@ -866,7 +866,7 @@
     if (FD_SETSIZE < Squid_MaxFD)
         Squid_MaxFD = FD_SETSIZE;
 
-#if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)
+#ifdef _SQUID_WIN32_
 #ifdef USE_WIN32_SERVICE
 
 if (WIN32_Subsystem_Init(&argc, &argv))