From 28bfab716b5a4c6def0f8faff92bcd83dcd7d319 Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Sat, 18 Dec 1999 17:44:56 +0000 Subject: [PATCH] - Make Win32 compile again --- main/main.c | 16 ++++++++++------ php4dllts.dsp | 2 +- tests/recurse | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/main/main.c b/main/main.c index 2d650e803b..0d49e271fd 100644 --- a/main/main.c +++ b/main/main.c @@ -898,12 +898,16 @@ int php_module_startup(sapi_module_struct *sf) WSADATA wsaData; #endif #if WIN32|WINNT - /* Get build numbers for Windows NT or Win95 */ - if (dwVersion < 0x80000000){ - php_os="WINNT"; - } else { - php_os="WIN32"; - } + { + DWORD dwVersion = GetVersion(); + + /* Get build numbers for Windows NT or Win95 */ + if (dwVersion < 0x80000000){ + php_os="WINNT"; + } else { + php_os="WIN32"; + } + } #else php_os=PHP_OS; #endif diff --git a/php4dllts.dsp b/php4dllts.dsp index 893324d23c..a0b899941a 100644 --- a/php4dllts.dsp +++ b/php4dllts.dsp @@ -411,7 +411,7 @@ SOURCE=.\ext\standard\parsedate.c # End Source File # Begin Source File -SOURCE=.\ext\mcal\php3_mcal.c +SOURCE=.\ext\mcal\php_mcal.c # End Source File # Begin Source File diff --git a/tests/recurse b/tests/recurse index 026394a9f4..5b8c646f6b 100644 --- a/tests/recurse +++ b/tests/recurse @@ -11,7 +11,7 @@ function factorial($n) for ($k=0; $k<10; $k++): -for ($i=0,$sum=0; $i<150; $i++) { +for ($i=0,$sum=0; $i<50; $i++) { $sum = $sum+factorial($i); } endfor; -- 2.50.1