fix compile with fix compile for for STLport 5.1.3 and MSVC 2005

pull/2/head
weidai 2007-09-15 02:38:57 +00:00
parent 8e944f75d5
commit 2f8e40cb4b
2 changed files with 2 additions and 2 deletions

View File

@ -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)
{

View File

@ -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