diff --git a/fipstest.cpp b/fipstest.cpp index 01ab761b..3298a400 100644 --- a/fipstest.cpp +++ b/fipstest.cpp @@ -279,7 +279,7 @@ bool IntegrityCheckModule(const char *moduleFilename, const byte *expectedModule char moduleFilenameBuf[MAX_PATH] = ""; if (moduleFilename == NULL) { -#if (defined(_MSC_VER) && _MSC_VER >= 1400) // ifstream doesn't support wide filename on other compilers +#if (_MSC_VER >= 1400 && !defined(_STLPORT_VERSION)) // ifstream doesn't support wide filename on other compilers wchar_t wideModuleFilename[MAX_PATH]; if (GetModuleFileNameW(s_hModule, wideModuleFilename, MAX_PATH) > 0) { diff --git a/zdeflate.cpp b/zdeflate.cpp index ae5e1a76..b08f357a 100644 --- a/zdeflate.cpp +++ b/zdeflate.cpp @@ -385,7 +385,7 @@ unsigned int Deflator::LongestMatch(unsigned int &bestMatch) const { assert(scan[2] == match[2]); unsigned int len = (unsigned int)( -#if defined(_STDEXT_BEGIN) && !(defined(_MSC_VER) && _MSC_VER < 1400) +#if defined(_STDEXT_BEGIN) && !(defined(_MSC_VER) && _MSC_VER < 1400) && !defined(_STLPORT_VERSION) stdext::unchecked_mismatch #else std::mismatch