CVS update: php31/main
| From: | shane | Date: | Sat, 17 Oct 1998 20:45:46 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1887@lists.php.net to get a copy of this message | ||
Date: Saturday October 17, 1998 @ 16:45
Author: shane
Update of /repository/php31/main
In directory asf:/u2/tmp/cvs-serv29817/main
Modified Files:
constants.c language-parser.y main.c php_custom_build.dsp
phpsapi_core.dsp
Log Message:
fixes to get 3.1 compiling again under windows.
mysql ported from 3.0 then backported to 3.0
Some project file updates
porting other extensions from 3.0 in process.
fixes to registry functions to support binary
Index: php31/main/constants.c
diff -c php31/main/constants.c:2.4 php31/main/constants.c:2.5
*** php31/main/constants.c:2.4 Sat Oct 17 14:19:47 1998
--- php31/main/constants.c Sat Oct 17 16:45:45 1998
***************
*** 220,226 ****
php3_str_tolower(lowercase_name, c->name_len);
if (_php3_hash_add(&GLOBAL(php3_constants), lowercase_name, c->name_len, (void *) c,
sizeof(php3_constant), NULL)==FAILURE) {
! pval_destructor(&c->value);
}
free(lowercase_name);
}
--- 220,226 ----
php3_str_tolower(lowercase_name, c->name_len);
if (_php3_hash_add(&GLOBAL(php3_constants), lowercase_name, c->name_len, (void *) c,
sizeof(php3_constant), NULL)==FAILURE) {
! pval_destructor(&c->value _INLINE_TLS);
}
free(lowercase_name);
}
Index: php31/main/language-parser.y
diff -c php31/main/language-parser.y:2.11 php31/main/language-parser.y:2.12
*** php31/main/language-parser.y:2.11 Sat Oct 17 14:19:47 1998
--- php31/main/language-parser.y Sat Oct 17 16:45:45 1998
***************
*** 31,37 ****
*/
! /* $Id: language-parser.y,v 2.11 1998/10/17 18:19:47 zeev Exp $ */
/*
--- 31,37 ----
*/
! /* $Id: language-parser.y,v 2.12 1998/10/17 20:45:45 shane Exp $ */
/*
***************
*** 763,773 ****
int i;
pval class_ptr;
int original_shutdown_requested;
! int original_execute_flag = GLOBAL(ExecuteFlag);
! FunctionState original_function_state = GLOBAL(function_state);
TLS_VARS;
original_shutdown_requested=GLOBAL(shutdown_requested);
/* save the location to go back to */
return_offset.offset = tc_get_current_offset(&GLOBAL(token_cache_manager) _INLINE_TLS)-1;
--- 763,775 ----
int i;
pval class_ptr;
int original_shutdown_requested;
! int original_execute_flag;
! FunctionState original_function_state;
TLS_VARS;
original_shutdown_requested=GLOBAL(shutdown_requested);
+ original_execute_flag = GLOBAL(ExecuteFlag);
+ original_function_state = GLOBAL(function_state);
/* save the location to go back to */
return_offset.offset = tc_get_current_offset(&GLOBAL(token_cache_manager) _INLINE_TLS)-1;
Index: php31/main/main.c
diff -c php31/main/main.c:2.43 php31/main/main.c:2.44
*** php31/main/main.c:2.43 Sat Oct 17 14:19:48 1998
--- php31/main/main.c Sat Oct 17 16:45:45 1998
***************
*** 29,35 ****
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.43 1998/10/17 18:19:48 zeev Exp $ */
/* #define CRASH_DETECTION */
--- 29,35 ----
+----------------------------------------------------------------------+
*/
! /* $Id: main.c,v 2.44 1998/10/17 20:45:45 shane Exp $ */
/* #define CRASH_DETECTION */
***************
*** 351,357 ****
if (!php3_header()) {
return;
}
! php3_printf("<br>\n<b>%s</b>: %s in <b>%s</b> on line
<b>%d</b><br>\n", error_type_str, buffer, filename,
php3_get_lineno(current_lineno));
}
}
}
--- 351,357 ----
if (!php3_header()) {
return;
}
! php3_printf("<br>\n<b>%s</b>: %s in <b>%s</b> on line
<b>%d</b><br>\n", error_type_str, buffer, filename,
php3_get_lineno(GLOBAL(current_lineno)));
}
}
}
Index: php31/main/php_custom_build.dsp
diff -c php31/main/php_custom_build.dsp:2.2 php31/main/php_custom_build.dsp:2.3
*** php31/main/php_custom_build.dsp:2.2 Tue Sep 15 17:58:57 1998
--- php31/main/php_custom_build.dsp Sat Oct 17 16:45:46 1998
***************
*** 1,5 ****
# Microsoft Developer Studio Project File - Name="php_custom_build" - Package
Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
--- 1,5 ----
# Microsoft Developer Studio Project File - Name="php_custom_build" - Package
Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
***************
*** 17,32 ****
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "php_custom_build - Win32 Release" (based on\
! "Win32 (x86) Static Library")
! !MESSAGE "php_custom_build - Win32 Debug" (based on\
! "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
!IF "$(CFG)" == "php_custom_build - Win32 Release"
--- 17,32 ----
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "php_custom_build - Win32 Release" (based on "Win32 (x86) Static
Library")
! !MESSAGE "php_custom_build - Win32 Debug" (based on "Win32 (x86) Static
Library")
!MESSAGE
# Begin Project
+ # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
+ RSC=rc.exe
!IF "$(CFG)" == "php_custom_build - Win32 Release"
***************
*** 42,47 ****
--- 42,49 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /FD /c
+ # ADD BASE RSC /l 0x409
+ # ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
***************
*** 63,68 ****
--- 65,72 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /FD /c
+ # ADD BASE RSC /l 0x409
+ # ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
***************
*** 83,89 ****
!IF "$(CFG)" == "php_custom_build - Win32 Release"
# Begin Custom Build - Build INI Bison Parser
! InputPath=.\ini-parser.y
"ini-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
bison.exe -p ini -v -d ini-parser.y
--- 87,93 ----
!IF "$(CFG)" == "php_custom_build - Win32 Release"
# Begin Custom Build - Build INI Bison Parser
! InputPath=".\ini-parser.y"
"ini-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
bison.exe -p ini -v -d ini-parser.y
***************
*** 94,100 ****
!ELSEIF "$(CFG)" == "php_custom_build - Win32 Debug"
# Begin Custom Build - Build INI Bison Parser
! InputPath=.\ini-parser.y
"ini-parser.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
bison.exe -p ini -v -d ini-parser.y
--- 98,104 ----
!ELSEIF "$(CFG)" == "php_custom_build - Win32 Debug"
# Begin Custom Build - Build INI Bison Parser
! InputPath=".\ini-parser.y"
"ini-parser.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
bison.exe -p ini -v -d ini-parser.y
***************
*** 108,119 ****
# Begin Source File
SOURCE=".\ini-scanner.l"
- USERDEP__INI_S="ini-parser.tab.c"
!IF "$(CFG)" == "php_custom_build - Win32 Release"
# Begin Custom Build - Build INI Flex Scanner
! InputPath=.\ini-scanner.l
"ini-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
flex.exe -Pini -oini-scanner.c -i ini-scanner.l
--- 112,123 ----
# Begin Source File
SOURCE=".\ini-scanner.l"
!IF "$(CFG)" == "php_custom_build - Win32 Release"
+ USERDEP__INI_S="ini-parser.tab.c"
# Begin Custom Build - Build INI Flex Scanner
! InputPath=".\ini-scanner.l"
"ini-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
flex.exe -Pini -oini-scanner.c -i ini-scanner.l
***************
*** 122,129 ****
!ELSEIF "$(CFG)" == "php_custom_build - Win32 Debug"
# Begin Custom Build - Build INI Flex Scanner
! InputPath=.\ini-scanner.l
"ini-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
flex.exe -Pini -oini-scanner.c -i ini-scanner.l
--- 126,134 ----
!ELSEIF "$(CFG)" == "php_custom_build - Win32 Debug"
+ USERDEP__INI_S="ini-parser.tab.c"
# Begin Custom Build - Build INI Flex Scanner
! InputPath=".\ini-scanner.l"
"ini-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
flex.exe -Pini -oini-scanner.c -i ini-scanner.l
***************
*** 140,149 ****
!IF "$(CFG)" == "php_custom_build - Win32 Release"
# Begin Custom Build - Build Language Bison Parser
! InputPath=.\language-parser.y
"language-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
! bison -S bison.simple -p php -v -d language-parser.y
copy language-parser.tab.h language-parser.h
# End Custom Build
--- 145,154 ----
!IF "$(CFG)" == "php_custom_build - Win32 Release"
# Begin Custom Build - Build Language Bison Parser
! InputPath=".\language-parser.y"
"language-parser.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
! bison -p php -v -d language-parser.y
copy language-parser.tab.h language-parser.h
# End Custom Build
***************
*** 151,157 ****
!ELSEIF "$(CFG)" == "php_custom_build - Win32 Debug"
# Begin Custom Build - Build Language Bison Parser
! InputPath=.\language-parser.y
"language-parser.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
bison -S bison.simple -p php -v -d language-parser.y
--- 156,162 ----
!ELSEIF "$(CFG)" == "php_custom_build - Win32 Debug"
# Begin Custom Build - Build Language Bison Parser
! InputPath=".\language-parser.y"
"language-parser.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
bison -S bison.simple -p php -v -d language-parser.y
***************
*** 165,176 ****
# Begin Source File
SOURCE=".\language-scanner.l"
- USERDEP__LANGU="language-parser.tab.c"
!IF "$(CFG)" == "php_custom_build - Win32 Release"
# Begin Custom Build - Build Language Flex Scanner
! InputPath=.\language-scanner.l
"language-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
plex -x -m %3 -Pphp -olanguage-scanner.c -i language-scanner.l
--- 170,181 ----
# Begin Source File
SOURCE=".\language-scanner.l"
!IF "$(CFG)" == "php_custom_build - Win32 Release"
+ USERDEP__LANGU="language-parser.tab.c"
# Begin Custom Build - Build Language Flex Scanner
! InputPath=".\language-scanner.l"
"language-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
plex -x -m %3 -Pphp -olanguage-scanner.c -i language-scanner.l
***************
*** 179,186 ****
!ELSEIF "$(CFG)" == "php_custom_build - Win32 Debug"
# Begin Custom Build - Build Language Flex Scanner
! InputPath=.\language-scanner.l
"language-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
plex -x -m %3 -Pphp -olanguage-scanner.c -i language-scanner.l
--- 184,192 ----
!ELSEIF "$(CFG)" == "php_custom_build - Win32 Debug"
+ USERDEP__LANGU="language-parser.tab.c"
# Begin Custom Build - Build Language Flex Scanner
! InputPath=".\language-scanner.l"
"language-scanner.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
plex -x -m %3 -Pphp -olanguage-scanner.c -i language-scanner.l
Index: php31/main/phpsapi_core.dsp
diff -c php31/main/phpsapi_core.dsp:2.14 php31/main/phpsapi_core.dsp:2.15
*** php31/main/phpsapi_core.dsp:2.14 Wed Sep 30 00:01:50 1998
--- php31/main/phpsapi_core.dsp Sat Oct 17 16:45:46 1998
***************
*** 1,5 ****
# Microsoft Developer Studio Project File - Name="phpsapi_core" - Package
Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
--- 1,5 ----
# Microsoft Developer Studio Project File - Name="phpsapi_core" - Package
Owner=<4>
! # Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
***************
*** 17,29 ****
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "phpsapi_core - Win32 Release" (based on\
! "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "phpsapi_core - Win32 Debug" (based on\
! "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
--- 17,28 ----
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "phpsapi_core - Win32 Release" (based on "Win32 (x86) Dynamic-Link
Library")
! !MESSAGE "phpsapi_core - Win32 Debug" (based on "Win32 (x86) Dynamic-Link
Library")
!MESSAGE
# Begin Project
+ # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
***************
*** 45,52 ****
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../main" /I "./"
/D "NDEBUG" /D "THREAD_SAFE" /D "USE_SAPI" /D "MSVC5" /D
"WIN32" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
--- 44,51 ----
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "../" /I "../../main" /I "./"
/D "NDEBUG" /D "THREAD_SAFE" /D "USE_SAPI" /D "MSVC5" /D
"WIN32" /D "_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
***************
*** 70,78 ****
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../" /I "../../main" /I
"./" /D "CRASH_DETECTION" /D "DEBUG" /D "_DEBUG" /D
"THREAD_SAFE" /D "USE_SAPI" /D "MSVC5" /D "WIN32" /D
"_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
--- 69,77 ----
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../" /I "../../main" /I
"./" /D "CRASH_DETECTION" /D "DEBUG" /D "_DEBUG" /D
"THREAD_SAFE" /D "USE_SAPI" /D "MSVC5" /D "WIN32" /D
"_WINDOWS" /YX /FD /c
! # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
! # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net