diff options
| author | Andi Gutmans <andi@php.net> | 1999-12-18 17:44:56 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-12-18 17:44:56 +0000 |
| commit | 28bfab716b5a4c6def0f8faff92bcd83dcd7d319 (patch) | |
| tree | f84373b3ee0bee3d7209df35ac00dd88d83c0ded | |
| parent | 6bdcfc745db1619d7162bbacf0a0870a83160ce8 (diff) | |
| download | php-git-28bfab716b5a4c6def0f8faff92bcd83dcd7d319.tar.gz | |
- Make Win32 compile again
| -rw-r--r-- | main/main.c | 16 | ||||
| -rw-r--r-- | php4dllts.dsp | 2 | ||||
| -rw-r--r-- | 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; |