fix compile with fix compile for for STLport 5.1.3 and MSVC 2005
parent
8e944f75d5
commit
2f8e40cb4b
|
|
@ -279,7 +279,7 @@ bool IntegrityCheckModule(const char *moduleFilename, const byte *expectedModule
|
||||||
char moduleFilenameBuf[MAX_PATH] = "";
|
char moduleFilenameBuf[MAX_PATH] = "";
|
||||||
if (moduleFilename == NULL)
|
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];
|
wchar_t wideModuleFilename[MAX_PATH];
|
||||||
if (GetModuleFileNameW(s_hModule, wideModuleFilename, MAX_PATH) > 0)
|
if (GetModuleFileNameW(s_hModule, wideModuleFilename, MAX_PATH) > 0)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -385,7 +385,7 @@ unsigned int Deflator::LongestMatch(unsigned int &bestMatch) const
|
||||||
{
|
{
|
||||||
assert(scan[2] == match[2]);
|
assert(scan[2] == match[2]);
|
||||||
unsigned int len = (unsigned int)(
|
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
|
stdext::unchecked_mismatch
|
||||||
#else
|
#else
|
||||||
std::mismatch
|
std::mismatch
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue