php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Make Win32 build work again

Browse Source 
* Make error_reporting value prior to the standard initialization be
  set so that errors show up
This commit is contained in:
Zeev Suraski
1999-07-24 16:52:00 +00:00
parent 24eb90c524
commit 68e32f6ac3
5 changed files with 62 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/fsock.c
View File

@@ -248,7 +248,7 @@ static void _php3_fsockopen(INTERNAL_FUNCTION_PARAMETERS, int persistent) {
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 */

12
ext/standard/parsedate.y
View File

@@ -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

7
main/main.c
View File

@@ -768,11 +768,10 @@ int php_module_startup(sapi_module_struct *sf)
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 @@ int php_module_startup(sapi_module_struct *sf)
return SUCCESS;
}
EG(error_reporting) = E_ALL & ~E_NOTICE;
sapi_module = *sf;
zend_output_startup();

24
php4dll.dsp
View File

@@ -363,6 +363,10 @@ SOURCE=.\ext\standard\pageinfo.c
# 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
@@ -738,6 +742,26 @@ BuildCmds= \
!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
# End Source File
# End Group
# Begin Group "Scanners"

24
php4dllts.dsp
View File

@@ -371,6 +371,10 @@ SOURCE=.\ext\standard\pageinfo.c
# 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
@@ -754,6 +758,26 @@ BuildCmds= \
!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
# End Source File
# End Group
# Begin Group "Scanners"