Squid-5 for Windows updates (#71)

Rolling preview for MinGW build fixes needed by Squid-5.

diff --git a/src/URL.h b/src/URL.h
index 97882df03f118f83d84a37c8061a29e37b591a06..2c5ebed651a02497bdf6b4b6a452fa1eab9e315d 100644 (file)
--- a/src/URL.h
+++ b/src/URL.h
@@ -216,7 +216,7 @@ enum MatchDomainNameFlags {
  * \retval 1 means the host is greater than the domain
  * \retval -1 means the host is less than the domain
  */
-int matchDomainName(const char *host, const char *domain, uint flags = mdnNone);
+int matchDomainName(const char *host, const char *domain, MatchDomainNameFlags flags = mdnNone);
 int urlCheckRequest(const HttpRequest *);
 char *urlHostname(const char *url);
 void urlExtMethodConfigure(void);

diff --git a/src/base/File.h b/src/base/File.h
index d4d7263ebea1fa5924edab7c190083ad1ebba9c3..7b6c91b1faaaca1fabf55e82edb41c70a9eb0e1c 100644 (file)
--- a/src/base/File.h
+++ b/src/base/File.h
@@ -115,10 +115,10 @@ private:
     // Windows-specific HANDLE is needed because LockFileEx() does not take POSIX FDs.
 #if _SQUID_WINDOWS_
     typedef HANDLE Handle;
-    static const Handle InvalidHandle = INVALID_HANDLE_VALUE;
+    static constexpr Handle InvalidHandle = INVALID_HANDLE_VALUE;
 #else
     typedef int Handle;
-    static const Handle InvalidHandle = -1;
+    static constexpr Handle InvalidHandle = -1;
 #endif
     Handle fd_ = InvalidHandle; ///< OS-specific file handle
 };

diff --git a/src/tests/stub_url.cc b/src/tests/stub_url.cc
index b13435274490d493a67c1a29ff00a32d99d5e434..223aa2824116be4e63e7d311d780b04c3397680e 100644 (file)
--- a/src/tests/stub_url.cc
+++ b/src/tests/stub_url.cc
@@ -37,7 +37,7 @@ bool urlIsRelative(const char *) STUB_RETVAL(false)
 char *urlMakeAbsolute(const HttpRequest *, const char *)STUB_RETVAL(nullptr)
 char *urlRInternal(const char *, unsigned short, const char *, const char *) STUB_RETVAL(nullptr)
 char *urlInternal(const char *, const char *) STUB_RETVAL(nullptr)
-int matchDomainName(const char *, const char *, uint) STUB_RETVAL(0)
+int matchDomainName(const char *, const char *, enum MatchDomainNameFlags) STUB_RETVAL(0)
 int urlCheckRequest(const HttpRequest *) STUB_RETVAL(0)
 char *urlHostname(const char *) STUB_RETVAL(nullptr)
 void urlExtMethodConfigure() STUB

diff --git a/src/url.cc b/src/url.cc
index 44b61522a2a6abc2769b2079c2abd12f87596424..9d33ac941444183d7e5dcd2b796acf7cca20b9c1 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -657,7 +657,7 @@ urlMakeAbsolute(const HttpRequest * req, const char *relUrl)
 }
 
 int
-matchDomainName(const char *h, const char *d, uint flags)
+matchDomainName(const char *h, const char *d, MatchDomainNameFlags flags)
 {
     int dl;
     int hl;