merge in changes by denis bider and fix compile on gcc 3.4.4 and MSVC 6

1 files changed, 7 insertions, 1 deletions

diff --git a/zdeflate.cpp b/zdeflate.cpp
index b83243cd..102dc4d8 100644
--- a/zdeflate.cpp
+++ b/zdeflate.cpp
@@ -383,7 +383,13 @@ unsigned int Deflator::LongestMatch(unsigned int &bestMatch) const
 		if (scan[bestLength-1] == match[bestLength-1] && scan[bestLength] == match[bestLength] && scan[0] == match[0] && scan[1] == match[1])
 		{
 			assert(scan[2] == match[2]);
-			unsigned int len = (unsigned int)(stdext::unchecked_mismatch(scan+3, scanEnd, match+3).first - scan);
+			unsigned int len = (unsigned int)(
+#ifdef _STDEXT_BEGIN
+				stdext::unchecked_mismatch
+#else
+				std::mismatch
+#endif
+				(scan+3, scanEnd, match+3).first - scan);
 			assert(len != bestLength);
 			if (len > bestLength)
 			{