cvs: /php4 main.c php4dll.dsp php4dllts.dsp /php4/ext/standard fsock.c parsedate.y

zeev Sat Jul 24 12:52:01 1999 EDT Modified files: /php4 main.c php4dll.dsp php4dllts.dsp /php4/ext/standard fsock.c parsedate.y Log: * Make Win32 build work again * Make error_reporting value prior to the standard initialization be set so that errors show up Index: php4/main.c diff -u php4/main.c:1.86 php4/main.c:1.87 --- php4/main.c:1.86 Wed Jul 21 11:10:04 1999 +++ php4/main.c Sat Jul 24 12:52:00 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.86 1999/07/21 15:10:04 andrey Exp $ */ +/* $Id: main.c,v 1.87 1999/07/24 16:52:00 zeev Exp $ */ #include <stdio.h> @@ -768,11 +768,10 @@ sapi_globals_struct *sapi_globals = ts_resource(sapi_globals_id); #endif #if (WIN32|WINNT) && !(USE_SAPI) - WORD wVersionRequested; + WORD wVersionRequested = MAKEWORD(2, 0); WSADATA wsaData; - - wVersionRequested = MAKEWORD(2, 0); #endif + ELS_FETCH(); SG(server_context) = NULL; SG(request_info).request_method = NULL; @@ -782,6 +781,8 @@ return SUCCESS; } + EG(error_reporting) = E_ALL & ~E_NOTICE; + sapi_module = *sf; zend_output_startup(); Index: php4/php4dll.dsp diff -u php4/php4dll.dsp:1.10 php4/php4dll.dsp:1.11 --- php4/php4dll.dsp:1.10 Sat Jul 17 13:35:44 1999 +++ php4/php4dll.dsp Sat Jul 24 12:52:00 1999 @@ -363,6 +363,10 @@ # End Source File # Begin Source File +SOURCE=.\ext\standard\parsedate.c +# End Source File +# Begin Source File + SOURCE=.\ext\pcre\php_pcre.c # End Source File # Begin Source File @@ -735,6 +739,26 @@ "configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) # End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\ext\standard\parsedate.y + +!IF "$(CFG)" == "php4dll - Win32 Debug" + +# Begin Custom Build +InputPath=.\ext\standard\parsedate.y + +"ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cd ext\standard + bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dll - Win32 Release" !ENDIF Index: php4/php4dllts.dsp diff -u php4/php4dllts.dsp:1.17 php4/php4dllts.dsp:1.18 --- php4/php4dllts.dsp:1.17 Sat Jul 24 10:36:48 1999 +++ php4/php4dllts.dsp Sat Jul 24 12:52:00 1999 @@ -371,6 +371,10 @@ # End Source File # Begin Source File +SOURCE=.\ext\standard\parsedate.c +# End Source File +# Begin Source File + SOURCE=.\ext\pcre\php_pcre.c # End Source File # Begin Source File @@ -751,6 +755,26 @@ "configuration-parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) # End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\ext\standard\parsedate.y + +!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" + +# Begin Custom Build +InputPath=.\ext\standard\parsedate.y + +"ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + cd ext\standard + bison --output=parsedate.c -v -d -S "C:\Program Files\Cygnus\share\bison.simple" parsedate.y + +# End Custom Build + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" !ENDIF Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.16 php4/ext/standard/fsock.c:1.17 --- php4/ext/standard/fsock.c:1.16 Sat Jul 24 10:36:48 1999 +++ php4/ext/standard/fsock.c Sat Jul 24 12:52:00 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.16 1999/07/24 14:36:48 zeev Exp $ */ +/* $Id: fsock.c,v 1.17 1999/07/24 16:52:00 zeev Exp $ */ /* Synced with php3 revision 1.121 1999-06-18 [ssb] */ /* Synced with php3 revision 1.133 1999-07-21 [sas] */ @@ -248,7 +248,7 @@ switch(arg_count) { case 5: convert_to_double(args[4]); - conv = (unsigned long) args[4]->value.dval * 1000000.0; + conv = (unsigned long) (args[4]->value.dval * 1000000.0); timeout.tv_sec = conv / 1000000; timeout.tv_usec = conv % 1000000; /* fall-through */ Index: php4/ext/standard/parsedate.y diff -u php4/ext/standard/parsedate.y:1.1 php4/ext/standard/parsedate.y:1.2 --- php4/ext/standard/parsedate.y:1.1 Fri Jul 23 15:51:27 1999 +++ php4/ext/standard/parsedate.y Sat Jul 24 12:52:00 1999 @@ -1,5 +1,5 @@ %{ -/* $Revision: 1.1 $ +/* $Revision: 1.2 $ ** ** Originally written by Steven M. Bellovin <smb@research.att.com> while ** at the University of North Carolina at Chapel Hill. Later tweaked by @@ -24,6 +24,10 @@ # include "php_config.h" #endif +#if WIN32||WINNT +#include <malloc.h> +#endif + #include <stdio.h> #include <sys/types.h> #include <time.h> @@ -41,10 +45,12 @@ #include <alloca.h> #endif -#ifndef HAVE_TM_ZONE -#ifndef _TIMEZONE +#if WIN32||WINNT +#include <time.h> +#else +# if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE) extern time_t timezone; -#endif +# endif #endif #define yylhs date_yylhs