archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Kalle Sommer Nielsen 2015-03-29 07:10:39 +02:00
parent 43457f960f
commit 313d01f30a
5 changed files with 5 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Zend/zend_config.w32.h
View file

@ -50,9 +50,6 @@ typedef unsigned int uint;
#if _MSC_VER < 1900 #if _MSC_VER < 1900
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif
#if _MSC_VER < 1500
#define vsnprintf _vsnprintf
#endif
#define strcasecmp(s1, s2) stricmp(s1, s2) #define strcasecmp(s1, s2) stricmp(s1, s2)
#define strncasecmp(s1, s2, n) strnicmp(s1, s2, n) #define strncasecmp(s1, s2, n) strnicmp(s1, s2, n)
#define zend_isinf(a) ((_fpclass(a) == _FPCLASS_PINF) || (_fpclass(a) == _FPCLASS_NINF)) #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 #ifdef ZEND_WIN32_FORCE_INLINE
/* _ALLOW_KEYWORD_MACROS is only relevant for C++ */ /* _ALLOW_KEYWORD_MACROS is only relevant for C++ */
# if (_MSC_VER >= 1700) && !defined(_ALLOW_KEYWORD_MACROS) # ifndef _ALLOW_KEYWORD_MACROS
# define _ALLOW_KEYWORD_MACROS # define _ALLOW_KEYWORD_MACROS
# endif # endif
# undef inline # undef inline
@ -85,17 +82,6 @@ typedef unsigned int uint;
#define ZEND_DLEXPORT __declspec(dllexport) #define ZEND_DLEXPORT __declspec(dllexport)
#define ZEND_DLIMPORT __declspec(dllimport) #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 */ #endif /* ZEND_CONFIG_W32_H */
/* /*

10
Zend/zend_float.h
View file

@ -76,17 +76,7 @@ END_EXTERN_C()
/* MSVC detection (MSVC people usually don't use autoconf) */ /* MSVC detection (MSVC people usually don't use autoconf) */
#if defined(_MSC_VER) && !defined(_WIN64) #if defined(_MSC_VER) && !defined(_WIN64)
# if _MSC_VER >= 1500
/* Visual C++ 2008 or higher, supports _controlfp_s */
# define HAVE__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 */ #endif /* _MSC_VER */
#ifdef HAVE__CONTROLFP_S #ifdef HAVE__CONTROLFP_S

6
Zend/zend_operators.h
View file

@ -416,10 +416,8 @@ ZEND_API void ZEND_FASTCALL zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_D
convert_scalar_to_number(pzv); \ convert_scalar_to_number(pzv); \
} }
#if HAVE_SETLOCALE && defined(ZEND_WIN32) && !defined(ZTS) && defined(_MSC_VER) && (_MSC_VER >= 1400) #if HAVE_SETLOCALE && defined(ZEND_WIN32) && !defined(ZTS) && defined(_MSC_VER)
/* This is performance improvement of tolower() on Windows and VC2005 /* This performance improvement of tolower() on Windows gives 10-18% on bench.php */
* Gives 10-18% on bench.php
*/
#define ZEND_USE_TOLOWER_L 1 #define ZEND_USE_TOLOWER_L 1
#endif #endif

4
Zend/zend_portability.h
View file

@ -198,7 +198,7 @@ char *alloca();
#if ZEND_GCC_VERSION >= 3001 || __has_attribute(deprecated) #if ZEND_GCC_VERSION >= 3001 || __has_attribute(deprecated)
# define ZEND_ATTRIBUTE_DEPRECATED __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) # define ZEND_ATTRIBUTE_DEPRECATED __declspec(deprecated)
#else #else
# define ZEND_ATTRIBUTE_DEPRECATED # define ZEND_ATTRIBUTE_DEPRECATED
@ -214,7 +214,7 @@ char *alloca();
#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 && defined(__i386__) #if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 && defined(__i386__)
# define ZEND_FASTCALL __attribute__((fastcall)) # 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 # define ZEND_FASTCALL __fastcall
#elif defined(_MSC_VER) && _MSC_VER >= 1800 #elif defined(_MSC_VER) && _MSC_VER >= 1800
# define ZEND_FASTCALL __vectorcall # define ZEND_FASTCALL __vectorcall

4
Zend/zend_virtual_cwd.c
View file

@ -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) { if (path_length == 0 || path_length >= MAXPATHLEN-1) {
#ifdef TSRM_WIN32 #ifdef TSRM_WIN32
# if _MSC_VER < 1300
errno = EINVAL;
# else
_set_errno(EINVAL); _set_errno(EINVAL);
# endif
#else #else
errno = EINVAL; errno = EINVAL;
#endif #endif