Changed _SQUID_MSWIN_ to _SQUID_WINDOWS_ everywhere.

diff --git a/helpers/basic_auth/LDAP/basic_ldap_auth.cc b/helpers/basic_auth/LDAP/basic_ldap_auth.cc
index 04e40ab827337dd3721da4c3b72841554eeac5bc..4d79b0fb9948ed233301e6f24e5192f94cb6d221 100644 (file)
--- a/helpers/basic_auth/LDAP/basic_ldap_auth.cc
+++ b/helpers/basic_auth/LDAP/basic_ldap_auth.cc
@@ -93,7 +93,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#if _SQUID_MSWIN_              /* Native Windows port and MinGW */
+#if _SQUID_WINDOWS_            /* Native Windows port and MinGW */
 
 #define snprintf _snprintf
 #include <windows.h>
@@ -554,7 +554,7 @@ main(int argc, char **argv)
     /* On Windows ldap_start_tls_s is available starting from Windows XP,
      * so we need to bind at run-time with the function entry point
      */
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
     if (use_tls) {
 
         HMODULE WLDAP32Handle;

diff --git a/helpers/basic_auth/RADIUS/basic_radius_auth.cc b/helpers/basic_auth/RADIUS/basic_radius_auth.cc
index 0cf9b78876d35993b05717487ed55209046be0d7..67426c651f711c52d3633c956819a7553e19a97b 100644 (file)
--- a/helpers/basic_auth/RADIUS/basic_radius_auth.cc
+++ b/helpers/basic_auth/RADIUS/basic_radius_auth.cc
@@ -120,7 +120,7 @@ static int retries = 30;
 
 char progname[] = "basic_radius_auth";
 
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
 void
 Win32SockCleanup(void)
 {
@@ -498,7 +498,7 @@ main(int argc, char **argv)
         fprintf(stderr, "FATAL: %s: Shared secret not specified\n", argv[0]);
         exit(1);
     }
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
     {
         WSADATA wsaData;
         WSAStartup(2, &wsaData);

diff --git a/helpers/digest_auth/LDAP/ldap_backend.cc b/helpers/digest_auth/LDAP/ldap_backend.cc
index 6efcaed9cb63f11095a85b2978e8e8d3d3669ea6..660fd5e4739a76522002d5a936e992ae565f6117 100644 (file)
--- a/helpers/digest_auth/LDAP/ldap_backend.cc
+++ b/helpers/digest_auth/LDAP/ldap_backend.cc
@@ -12,7 +12,7 @@
 
 #include "ldap_backend.h"
 
-#if _SQUID_MSWIN_              /* Native Windows port and MinGW */
+#if _SQUID_WINDOWS_            /* Native Windows port and MinGW */
 
 #define snprintf _snprintf
 #include <windows.h>
@@ -301,7 +301,7 @@ ldapconnect(void)
     /* On Windows ldap_start_tls_s is available starting from Windows XP,
      * so we need to bind at run-time with the function entry point
      */
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
     if (use_tls) {
 
         HMODULE WLDAP32Handle;

diff --git a/helpers/digest_auth/eDirectory/edir_ldapext.cc b/helpers/digest_auth/eDirectory/edir_ldapext.cc
index 49d896eeb031aa422b1f773f407ff962033b9eb1..f221136b62034b03a878d185cd8aa7d7f36ad6bc 100644 (file)
--- a/helpers/digest_auth/eDirectory/edir_ldapext.cc
+++ b/helpers/digest_auth/eDirectory/edir_ldapext.cc
@@ -26,7 +26,7 @@
 
 #include "digest_common.h"
 
-#if _SQUID_MSWIN_            /* Native Windows port and MinGW */
+#if _SQUID_WINDOWS_            /* Native Windows port and MinGW */
 
 #define snprintf _snprintf
 #include <windows.h>

diff --git a/helpers/digest_auth/eDirectory/ldap_backend.cc b/helpers/digest_auth/eDirectory/ldap_backend.cc
index 0a40403c9a2804b33f791443b2e3b4a66960a9ad..83dba0cfa9444cf84bc252da01d4a9bfd293cb77 100644 (file)
--- a/helpers/digest_auth/eDirectory/ldap_backend.cc
+++ b/helpers/digest_auth/eDirectory/ldap_backend.cc
@@ -11,7 +11,7 @@
 
 #include "ldap_backend.h"
 
-#if _SQUID_MSWIN_              /* Native Windows port and MinGW */
+#if _SQUID_WINDOWS_            /* Native Windows port and MinGW */
 
 #define snprintf _snprintf
 #include <windows.h>
@@ -329,7 +329,7 @@ ldapconnect(void)
     /* On Windows ldap_start_tls_s is available starting from Windows XP,
      * so we need to bind at run-time with the function entry point
      */
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
     if (use_tls) {
 
         HMODULE WLDAP32Handle;

diff --git a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc
index 2a1a778ff0b032ea688dbf2787686971d5ebe10a..7f8c702ecd6c9a915eb06765439b753061cf04c3 100644 (file)
--- a/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc
+++ b/helpers/external_acl/LDAP_group/ext_ldap_group_acl.cc
@@ -51,7 +51,7 @@
 #include <ctype.h>
 #endif
 
-#if _SQUID_MSWIN_              /* Native Windows port and MinGW */
+#if _SQUID_WINDOWS_            /* Native Windows port and MinGW */
 
 #define snprintf _snprintf
 #include <windows.h>
@@ -451,7 +451,7 @@ main(int argc, char **argv)
     /* On Windows ldap_start_tls_s is available starting from Windows XP,
      * so we need to bind at run-time with the function entry point
      */
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
     if (use_tls) {
 
         HMODULE WLDAP32Handle;

diff --git a/lib/dirent.c b/lib/dirent.c
index cc3c2c322d8dcbbe52b420bd6d0d6661dec699be..1d129af68977582d6c5ea06269b14e98a384ccc9 100644 (file)
--- a/lib/dirent.c
+++ b/lib/dirent.c
@@ -51,7 +51,7 @@
 #include "squid.h"
 
 /* The following code section is part of the native Windows Squid port */
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
 
 #include "util.h"
 #include <stdlib.h>
@@ -314,4 +314,4 @@ seekdir(DIR * dirp, long lPos)
         while ((dirp->dd_stat < lPos) && readdir(dirp));
     }
 }
-#endif /* _SQUID_MSWIN_ */
+#endif /* _SQUID_WINDOWS_ */

diff --git a/src/DiskIO/AIO/aio_win32.h b/src/DiskIO/AIO/aio_win32.h
index f1743a92fdd9938a025e7589665aa1f325e2736e..762bc4d1755838a63b9dcdc0b51933ad2cd8161b 100644 (file)
--- a/src/DiskIO/AIO/aio_win32.h
+++ b/src/DiskIO/AIO/aio_win32.h
@@ -40,7 +40,7 @@
 typedef int64_t        off64_t;
 #endif
 
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
 
 union sigval {
     int sival_int; /* integer value */
@@ -102,6 +102,6 @@ int aio_error64(const struct aiocb64 *);
 int aio_open(const char *, int);
 void aio_close(int);
 
-#endif /* _SQUID_MSWIN_ */
+#endif /* _SQUID_WINDOWS_ */
 #endif /* USE_DISKIO_AIO */
 #endif /* __WIN32_AIO_H__ */

diff --git a/src/WinSvc.cc b/src/WinSvc.cc
index 6cdb28faafbda2d8984ad6028b11cd9c253aeba5..18f8b794b29a61a428a1163032356f881e03b72d 100644 (file)
--- a/src/WinSvc.cc
+++ b/src/WinSvc.cc
@@ -36,7 +36,7 @@
 
 #include "squid-old.h"
 
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
 #ifndef _MSWSOCK_
 #include <mswsock.h>
 #endif
@@ -56,7 +56,7 @@ static void WIN32_build_argv (char *);
 #endif
 extern "C" void WINAPI SquidWinSvcMain(DWORD, char **);
 
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
 #if defined(_MSC_VER) /* Microsoft C Compiler ONLY */
 void Squid_Win32InvalidParameterHandler(const wchar_t*, const wchar_t*, const wchar_t*, unsigned int, uintptr_t);
 #endif
@@ -66,7 +66,7 @@ SQUIDCEXTERN LPCRITICAL_SECTION dbg_mutex;
 void WIN32_ExceptionHandlerCleanup(void);
 static int s_iInitCount = 0;
 static HANDLE NotifyAddrChange_thread = INVALID_HANDLE_VALUE;
-#endif /* _SQUID_MSWIN_ */
+#endif /* _SQUID_WINDOWS_ */
 
 static int Squid_Aborting = 0;
 
@@ -400,7 +400,7 @@ WIN32_Abort(int sig)
     WIN32_Exit();
 }
 
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
 void
 WIN32_IpAddrChangeMonitorExit()
 {
@@ -416,7 +416,7 @@ WIN32_IpAddrChangeMonitorExit()
 void
 WIN32_Exit()
 {
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
     Win32SockCleanup();
 #endif
 #if USE_WIN32_SERVICE
@@ -429,7 +429,7 @@ WIN32_Exit()
     }
 
 #endif
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
     if (dbg_mutex)
         DeleteCriticalSection(dbg_mutex);
 
@@ -441,7 +441,7 @@ WIN32_Exit()
     _exit(0);
 }
 
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
 static DWORD WINAPI
 WIN32_IpAddrChangeMonitor(LPVOID lpParam)
 {
@@ -483,7 +483,7 @@ WIN32_IpAddrChangeMonitorInit()
     }
     return status;
 }
-#endif /* _SQUID_MSWIN_ */
+#endif /* _SQUID_WINDOWS_ */
 
 int WIN32_Subsystem_Init(int * argc, char *** argv)
 {
@@ -579,7 +579,7 @@ int WIN32_Subsystem_Init(int * argc, char *** argv)
         svcStatus.dwCheckPoint = 0;
         svcStatus.dwWaitHint = 10000;
         SetServiceStatus(svcHandle, &svcStatus);
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
 
         _setmaxstdio(Squid_MaxFD);
 #endif
@@ -587,7 +587,7 @@ int WIN32_Subsystem_Init(int * argc, char *** argv)
     }
 
 #endif /* USE_WIN32_SERVICE */
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
     if (Win32SockInit() < 0)
         return 1;
 
@@ -963,7 +963,7 @@ int main(int argc, char **argv)
         }
     } else {
         WIN32_run_mode = _WIN_SQUID_RUN_MODE_INTERACTIVE;
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
 
         opt_no_daemon = 1;
 
@@ -977,7 +977,7 @@ int main(int argc, char **argv)
 
 #endif /* USE_WIN32_SERVICE */
 
-#if _SQUID_MSWIN_
+#if _SQUID_WINDOWS_
 static int Win32SockInit(void)
 {
     int iVersionRequested;