From: Kalle Sommer Nielsen <kalle@php.net>
Date: Sun, 29 Mar 2015 05:10:39 +0000 (+0200)
Subject: Drop old VC support in Zend Engine, this also kills the remaining MessageBox fix... 
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~470
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=313d01f30afc4649cbb9eedd2ec11a9fac5bf932;p=php

Drop old VC support in Zend Engine, this also kills the remaining MessageBox fix for Windows 9x that Anatol changed a while back
---

diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h
index da32b13a0b..10d4a0b06e 100644
--- a/Zend/zend_config.w32.h
+++ b/Zend/zend_config.w32.h
@@ -50,9 +50,6 @@ typedef unsigned int uint;
 #if _MSC_VER < 1900
 #define snprintf _snprintf
 #endif
-#if _MSC_VER < 1500
-#define vsnprintf _vsnprintf
-#endif
 #define strcasecmp(s1, s2) stricmp(s1, s2)
 #define strncasecmp(s1, s2, n) strnicmp(s1, s2, n)
 #define zend_isinf(a)	((_fpclass(a) == _FPCLASS_PINF) || (_fpclass(a) == _FPCLASS_NINF))
@@ -66,7 +63,7 @@ typedef unsigned int uint;
  */
 #ifdef ZEND_WIN32_FORCE_INLINE
 /* _ALLOW_KEYWORD_MACROS is only relevant for C++ */
-# if (_MSC_VER >= 1700) && !defined(_ALLOW_KEYWORD_MACROS)
+# ifndef _ALLOW_KEYWORD_MACROS
 #  define _ALLOW_KEYWORD_MACROS
 # endif
 # undef inline
@@ -85,17 +82,6 @@ typedef unsigned int uint;
 #define ZEND_DLEXPORT		__declspec(dllexport)
 #define ZEND_DLIMPORT		__declspec(dllimport)
 
-/* 0x00200000L is MB_SERVICE_NOTIFICATION, which is only supported under Windows NT
- * (and requires _WIN32_WINNT to be defined, which prevents the resulting executable
- * from running under Windows 9x
- * Windows 9x should silently ignore it, so it's being used here directly
- */
-#ifndef MB_SERVICE_NOTIFICATION
-#define	MB_SERVICE_NOTIFICATION		0x00200000L
-#endif
-
-#define ZEND_SERVICE_MB_STYLE		(MB_TOPMOST|MB_SERVICE_NOTIFICATION)
-
 #endif /* ZEND_CONFIG_W32_H */
 
 /*
diff --git a/Zend/zend_float.h b/Zend/zend_float.h
index 14cdbb265e..2ba3eb7fe7 100644
--- a/Zend/zend_float.h
+++ b/Zend/zend_float.h
@@ -76,17 +76,7 @@ END_EXTERN_C()
 
 /* MSVC detection (MSVC people usually don't use autoconf) */
 #if defined(_MSC_VER) && !defined(_WIN64)
-# if _MSC_VER >= 1500
-   /* Visual C++ 2008 or higher, supports _controlfp_s */
 #  define HAVE__CONTROLFP_S
-# else
-   /* Visual C++ (up to 2005), supports _controlfp */
-#  define HAVE__CONTROLFP
-# endif /* MSC_VER >= 1500 */
-  /* Tell MSVC optimizer that we access FP environment */
-# if _MSC_VER >= 1500
-#  pragma fenv_access (on)
-# endif
 #endif /* _MSC_VER */
 
 #ifdef HAVE__CONTROLFP_S
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 962b453bc2..9e937eba3b 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -416,10 +416,8 @@ ZEND_API void ZEND_FASTCALL zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_D
 		convert_scalar_to_number(pzv);					\
 	}
 
-#if HAVE_SETLOCALE && defined(ZEND_WIN32) && !defined(ZTS) && defined(_MSC_VER) && (_MSC_VER >= 1400)
-/* This is performance improvement of tolower() on Windows and VC2005
- * Gives 10-18% on bench.php
- */
+#if HAVE_SETLOCALE && defined(ZEND_WIN32) && !defined(ZTS) && defined(_MSC_VER)
+/* This performance improvement of tolower() on Windows gives 10-18% on bench.php */
 #define ZEND_USE_TOLOWER_L 1
 #endif
 
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index 05ef0df53e..eca9c83f89 100644
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -198,7 +198,7 @@ char *alloca();
 
 #if ZEND_GCC_VERSION >= 3001 || __has_attribute(deprecated)
 # define ZEND_ATTRIBUTE_DEPRECATED  __attribute__((deprecated))
-#elif defined(ZEND_WIN32) && defined(_MSC_VER) && _MSC_VER >= 1300
+#elif defined(ZEND_WIN32)
 # define ZEND_ATTRIBUTE_DEPRECATED  __declspec(deprecated)
 #else
 # define ZEND_ATTRIBUTE_DEPRECATED
@@ -214,7 +214,7 @@ char *alloca();
 
 #if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 && defined(__i386__)
 # define ZEND_FASTCALL __attribute__((fastcall))
-#elif defined(_MSC_VER) && defined(_M_IX86) && _MSC_VER <= 1700
+#elif defined(_MSC_VER) && defined(_M_IX86) && _MSC_VER == 1700
 # define ZEND_FASTCALL __fastcall
 #elif defined(_MSC_VER) && _MSC_VER >= 1800
 # define ZEND_FASTCALL __vectorcall
diff --git a/Zend/zend_virtual_cwd.c b/Zend/zend_virtual_cwd.c
index 85e40bb964..70b42657a4 100644
--- a/Zend/zend_virtual_cwd.c
+++ b/Zend/zend_virtual_cwd.c
@@ -1191,11 +1191,7 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
 
 	if (path_length == 0 || path_length >= MAXPATHLEN-1) {
 #ifdef TSRM_WIN32
-# if _MSC_VER < 1300
-		errno = EINVAL;
-# else
 		_set_errno(EINVAL);
-# endif
 #else
 		errno = EINVAL;
 #endif