diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2015-03-29 07:10:39 +0200 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2015-03-29 07:10:39 +0200 |
| commit | 313d01f30afc4649cbb9eedd2ec11a9fac5bf932 (patch) | |
| tree | 7cc3e17b6596dec0e82249845f886e9e12babc0a /Zend/zend_config.w32.h | |
| parent | 43457f960ff2e84c87297f09a9dcc0da93ccee32 (diff) | |
| download | php-git-313d01f30afc4649cbb9eedd2ec11a9fac5bf932.tar.gz | |
Drop old VC support in Zend Engine, this also kills the remaining MessageBox fix for Windows 9x that Anatol changed a while back
Diffstat (limited to 'Zend/zend_config.w32.h')
| -rw-r--r-- | Zend/zend_config.w32.h | 16 |
1 files changed, 1 insertions, 15 deletions
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 */ /* |