Justtechjobs.com Find a programming school near you






Online Campus Both


php4-beta | 199912

[PHP4BETA] cvs: /php4 main.c php4dllts.dsp /php4/tests recurse From: Andi Gutmans (andi <email protected>)
Date: 12/18/99

andi Sat Dec 18 12:45:28 1999 EDT

  Modified files:
    /php4 main.c php4dllts.dsp
    /php4/tests recurse
  Log:
  - Make Win32 compile again
  
  
Index: php4/main.c
diff -u php4/main.c:1.161 php4/main.c:1.162
--- php4/main.c:1.161 Fri Dec 17 15:54:32 1999
+++ php4/main.c Sat Dec 18 12:44:55 1999
@@ -19,7 +19,7 @@
 */
 
 
-/* $Id: main.c,v 1.161 1999/12/17 20:54:32 zeev Exp $ */
+/* $Id: main.c,v 1.162 1999/12/18 17:44:55 andi Exp $ */
 
 
 #include <stdio.h>
@@ -898,12 +898,16 @@
         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
Index: php4/php4dllts.dsp
diff -u php4/php4dllts.dsp:1.39 php4/php4dllts.dsp:1.40
--- php4/php4dllts.dsp:1.39 Tue Dec 7 11:28:26 1999
+++ php4/php4dllts.dsp Sat Dec 18 12:44:55 1999
@@ -411,7 +411,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\ext\mcal\php3_mcal.c
+SOURCE=.\ext\mcal\php_mcal.c
 # End Source File
 # Begin Source File
 
Index: php4/tests/recurse
diff -u php4/tests/recurse:1.1 php4/tests/recurse:1.2
--- php4/tests/recurse:1.1 Thu Jul 8 17:56:19 1999
+++ php4/tests/recurse Sat Dec 18 12:44:56 1999
@@ -11,7 +11,7 @@
 
 
 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; 

-- 
PHP 4.0 Beta Mailing List <http://www.php.net/version4/>
To unsubscribe, e-mail: php4beta-unsubscribe <email protected>
For additional commands, e-mail: php4beta-help <email protected>
To contact the list administrators, e-mail: php4beta-admin <email protected>