fix build with latest MinGW on Windows

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/DateMath.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/DateMath.cpp
index b74fb5b..ed6ef7b 100644 (file)
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/DateMath.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/DateMath.cpp
@@ -749,14 +749,14 @@ static double parseDateFromNullTerminatedCharacters(const char* dateString, bool
 
             skipSpacesAndComments(dateString);
 
-            if (strncasecmp(dateString, "AM", 2) == 0) {
+            if (qstrnicmp(dateString, "AM", 2) == 0) {
                 if (hour > 12)
                     return NaN;
                 if (hour == 12)
                     hour = 0;
                 dateString += 2;
                 skipSpacesAndComments(dateString);
-            } else if (strncasecmp(dateString, "PM", 2) == 0) {
+            } else if (qstrnicmp(dateString, "PM", 2) == 0) {
                 if (hour > 12)
                     return NaN;
                 if (hour != 12)
@@ -770,7 +770,7 @@ static double parseDateFromNullTerminatedCharacters(const char* dateString, bool
     // Don't fail if the time zone is missing. 
     // Some websites omit the time zone (4275206).
     if (*dateString) {
-        if (strncasecmp(dateString, "GMT", 3) == 0 || strncasecmp(dateString, "UTC", 3) == 0) {
+        if (qstrnicmp(dateString, "GMT", 3) == 0 || qstrnicmp(dateString, "UTC", 3) == 0) {
             dateString += 3;
             haveTZ = true;
         }
@@ -798,7 +798,7 @@ static double parseDateFromNullTerminatedCharacters(const char* dateString, bool
             haveTZ = true;
         } else {
             for (int i = 0; i < int(sizeof(known_zones) / sizeof(KnownZone)); i++) {
-                if (0 == strncasecmp(dateString, known_zones[i].tzName, strlen(known_zones[i].tzName))) {
+                if (0 == qstrnicmp(dateString, known_zones[i].tzName, strlen(known_zones[i].tzName))) {
                     offset = known_zones[i].tzOffset;
                     dateString += strlen(known_zones[i].tzName);
                     haveTZ = true;

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h
index a1c4344..8c53bc0 100644 (file)
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h
@@ -76,16 +76,6 @@ inline char* strdup(const char* strSource)
 
 #endif
 
-inline int strncasecmp(const char* s1, const char* s2, size_t len)
-{
-    return _strnicmp(s1, s2, len);
-}
-
-inline int strcasecmp(const char* s1, const char* s2)
-{
-    return _stricmp(s1, s2);
-}
-
 #endif
 
 #if OS(WINDOWS) || OS(LINUX) || OS(SOLARIS)
@@ -105,11 +95,4 @@ inline char* strnstr(const char* buffer, const char* target, size_t bufferLength
 
 #endif
 
-#if COMPILER(RVCT) && __ARMCC_VERSION < 400000
-
-int strcasecmp(const char* s1, const char* s2);
-int strncasecmp(const char* s1, const char* s2, size_t len);
-
-#endif
-
 #endif // WTF_StringExtras_h