- Make Win32 compile again

diff --git a/main/main.c b/main/main.c
index 2d650e803b6b9355530ecbc53b8d41a0c4f42434..0d49e271fdf8126fb597e5e55736dbf640be29c7 100644 (file)
--- 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 893324d23c297c97aa0c60c7627431737e4b321a..a0b899941a1053abcdec64318d9ad449652e5287 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -411,7 +411,7 @@ SOURCE=.\ext\standard\parsedate.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\ext\mcal\php3_mcal.c\r
+SOURCE=.\ext\mcal\php_mcal.c\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/tests/recurse b/tests/recurse
index 026394a9f4db33d2d5cc83e5956bb70c958e7cee..5b8c646f6b7335b10be2c3f6b5075c18c416dfc3 100644 (file)
--- 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;