kalle Tue, 13 Apr 2010 11:14:04 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=297956
Log:
PHP_OS is now always WINNT on Windows, since we don't support anything prior to
XP SP2
Changed paths:
U php/php-src/trunk/main/main.c
Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c 2010-04-13 11:02:15 UTC (rev 297955)
+++ php/php-src/trunk/main/main.c 2010-04-13 11:14:04 UTC (rev 297956)
@@ -1745,7 +1745,7 @@
}
/* }}} */
-#if defined(PHP_WIN32) && defined(_MSC_VER) && (_MSC_VER >= 1400)
+#if defined(PHP_WIN32) && _MSC_VER >= 1400
static _invalid_parameter_handler old_invalid_parameter_handler;
void dummy_invalid_parameter_handler(
@@ -1795,14 +1795,8 @@
WSADATA wsaData;
#endif
#ifdef PHP_WIN32
- DWORD dwVersion = GetVersion();
- /* Get build numbers for Windows NT or Win95 */
- if (dwVersion < 0x80000000){
- php_os="WINNT";
- } else {
- php_os="WIN32";
- }
-#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+ php_os = "WINNT";
+#if _MSC_VER >= 1400
old_invalid_parameter_handler =
_set_invalid_parameter_handler(dummy_invalid_parameter_handler);
if (old_invalid_parameter_handler != NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
