| @@ -276,8 +276,10 @@ public: | |||||
| int compareIgnoreCase (const CharPointer_ASCII other) const | int compareIgnoreCase (const CharPointer_ASCII other) const | ||||
| { | { | ||||
| #if JUCE_WINDOWS | |||||
| #if JUCE_MSVC | |||||
| return stricmp (data, other.data); | return stricmp (data, other.data); | ||||
| #elif JUCE_MINGW | |||||
| return CharacterFunctions::compareIgnoreCase (*this, other); | |||||
| #else | #else | ||||
| return strcasecmp (data, other.data); | return strcasecmp (data, other.data); | ||||
| #endif | #endif | ||||
| @@ -344,7 +346,7 @@ public: | |||||
| /** Parses this string as a 64-bit integer. */ | /** Parses this string as a 64-bit integer. */ | ||||
| int64 getIntValue64() const noexcept | int64 getIntValue64() const noexcept | ||||
| { | { | ||||
| #if JUCE_LINUX || JUCE_ANDROID | |||||
| #if JUCE_LINUX || JUCE_ANDROID || JUCE_MINGW | |||||
| return atoll (data); | return atoll (data); | ||||
| #elif JUCE_WINDOWS | #elif JUCE_WINDOWS | ||||
| return _atoi64 (data); | return _atoi64 (data); | ||||
| @@ -349,7 +349,7 @@ public: | |||||
| return CharacterFunctions::compareIgnoreCaseUpTo (*this, other, maxChars); | return CharacterFunctions::compareIgnoreCaseUpTo (*this, other, maxChars); | ||||
| } | } | ||||
| #if JUCE_WINDOWS && ! DOXYGEN | |||||
| #if JUCE_MSVC && ! DOXYGEN | |||||
| int compareIgnoreCase (const CharPointer_UTF16 other) const noexcept | int compareIgnoreCase (const CharPointer_UTF16 other) const noexcept | ||||
| { | { | ||||
| return _wcsicmp (data, other.data); | return _wcsicmp (data, other.data); | ||||
| @@ -408,7 +408,7 @@ public: | |||||
| /** Parses this string as a 32-bit integer. */ | /** Parses this string as a 32-bit integer. */ | ||||
| int getIntValue32() const noexcept | int getIntValue32() const noexcept | ||||
| { | { | ||||
| #if JUCE_WINDOWS | |||||
| #if JUCE_MSVC | |||||
| return _wtoi (data); | return _wtoi (data); | ||||
| #else | #else | ||||
| return CharacterFunctions::getIntValue <int, CharPointer_UTF16> (*this); | return CharacterFunctions::getIntValue <int, CharPointer_UTF16> (*this); | ||||
| @@ -418,7 +418,7 @@ public: | |||||
| /** Parses this string as a 64-bit integer. */ | /** Parses this string as a 64-bit integer. */ | ||||
| int64 getIntValue64() const noexcept | int64 getIntValue64() const noexcept | ||||
| { | { | ||||
| #if JUCE_WINDOWS | |||||
| #if JUCE_MSVC | |||||
| return _wtoi64 (data); | return _wtoi64 (data); | ||||
| #else | #else | ||||
| return CharacterFunctions::getIntValue <int64, CharPointer_UTF16> (*this); | return CharacterFunctions::getIntValue <int64, CharPointer_UTF16> (*this); | ||||
| @@ -421,8 +421,10 @@ public: | |||||
| /** Compares this string with another one. */ | /** Compares this string with another one. */ | ||||
| int compareIgnoreCase (const CharPointer_UTF8 other) const noexcept | int compareIgnoreCase (const CharPointer_UTF8 other) const noexcept | ||||
| { | { | ||||
| #if JUCE_WINDOWS | |||||
| #if JUCE_MSVC | |||||
| return stricmp (data, other.data); | return stricmp (data, other.data); | ||||
| #elif JUCE_MINGW | |||||
| return CharacterFunctions::compareIgnoreCase (*this, other); | |||||
| #else | #else | ||||
| return strcasecmp (data, other.data); | return strcasecmp (data, other.data); | ||||
| #endif | #endif | ||||
| @@ -479,7 +481,7 @@ public: | |||||
| /** Parses this string as a 64-bit integer. */ | /** Parses this string as a 64-bit integer. */ | ||||
| int64 getIntValue64() const noexcept | int64 getIntValue64() const noexcept | ||||
| { | { | ||||
| #if JUCE_LINUX || JUCE_ANDROID | |||||
| #if JUCE_LINUX || JUCE_ANDROID || JUCE_MINGW | |||||
| return atoll (data); | return atoll (data); | ||||
| #elif JUCE_WINDOWS | #elif JUCE_WINDOWS | ||||
| return _atoi64 (data); | return _atoi64 (data); | ||||
| @@ -361,7 +361,7 @@ String Time::getTimeZone() const noexcept | |||||
| { | { | ||||
| String zone[2]; | String zone[2]; | ||||
| #if JUCE_WINDOWS | |||||
| #if JUCE_MSVC | |||||
| _tzset(); | _tzset(); | ||||
| #ifdef _INC_TIME_INL | #ifdef _INC_TIME_INL | ||||
| @@ -378,7 +378,11 @@ String Time::getTimeZone() const noexcept | |||||
| zone[1] = zonePtr[1]; | zone[1] = zonePtr[1]; | ||||
| #endif | #endif | ||||
| #else | #else | ||||
| #if JUCE_MINGW | |||||
| #warning "Can't find a replacement for tzset on mingw - ideas welcome!" | |||||
| #else | |||||
| tzset(); | tzset(); | ||||
| #endif | |||||
| const char** const zonePtr = (const char**) tzname; | const char** const zonePtr = (const char**) tzname; | ||||
| zone[0] = zonePtr[0]; | zone[0] = zonePtr[0]; | ||||
| zone[1] = zonePtr[1]; | zone[1] = zonePtr[1]; | ||||