CVS update: php31/main
| From: | shane | Date: | Tue, 01 Sep 1998 21:44:15 +0000 |
| Subject: | CVS update: php31/main | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-728@lists.php.net to get a copy of this message | ||
Date: Tuesday September 1, 1998 @ 17:44
Author: shane
Update of /repository/php31/main
In directory asf:/u2/tmp/cvs-serv29456/main
Modified Files:
language-scanner.l phpsapi_core.dsp
Log Message:
fix get_meta_tags
fix compilation in scanner
update project file for dl
Index: php31/main/language-scanner.l
diff -c php31/main/language-scanner.l:2.9 php31/main/language-scanner.l:2.10
*** php31/main/language-scanner.l:2.9 Tue Sep 1 13:43:31 1998
--- php31/main/language-scanner.l Tue Sep 1 17:44:15 1998
***************
*** 149,161 ****
int include_file(pval *file, int display_source)
{
FILE *tmp;
! YY_BUFFER_STATE buffer_state = YY_CURRENT_BUFFER;
PHPLexState lex_state;
char *filename;
int issock=0, socketd=0;
YY_TLS_VARS;
TLS_VARS;
convert_to_string(file);
if (file->type!=IS_STRING) {
--- 149,162 ----
int include_file(pval *file, int display_source)
{
FILE *tmp;
! YY_BUFFER_STATE buffer_state;
PHPLexState lex_state;
char *filename;
int issock=0, socketd=0;
YY_TLS_VARS;
TLS_VARS;
+ buffer_state = YY_CURRENT_BUFFER;
convert_to_string(file);
if (file->type!=IS_STRING) {
***************
*** 196,204 ****
void eval_string(pval *str,pval *return_offset, int display_source INLINE_TLS)
{
PHPLexState lex_state;
! YY_BUFFER_STATE buffer_state = YY_CURRENT_BUFFER;
YY_TLS_VARS;
convert_to_string(str);
if (str->value.str.val[0]=='\0') { /* optimize empty eval's */
--- 197,206 ----
void eval_string(pval *str,pval *return_offset, int display_source INLINE_TLS)
{
PHPLexState lex_state;
! YY_BUFFER_STATE buffer_state;
YY_TLS_VARS;
+ buffer_state = YY_CURRENT_BUFFER;
convert_to_string(str);
if (str->value.str.val[0]=='\0') { /* optimize empty eval's */
***************
*** 246,257 ****
int conditional_include_file(pval *file,pval *return_offset INLINE_TLS)
{
PHPLexState lex_state;
! YY_BUFFER_STATE buffer_state = YY_CURRENT_BUFFER;
FILE *tmp;
char *filename;
! int issock=0, socketd=0;;
YY_TLS_VARS;
convert_to_string(file);
memcpy(&lex_state.buffer_state,&buffer_state,sizeof(YY_BUFFER_STATE));
--- 248,260 ----
int conditional_include_file(pval *file,pval *return_offset INLINE_TLS)
{
PHPLexState lex_state;
! YY_BUFFER_STATE buffer_state;
FILE *tmp;
char *filename;
! int issock=0, socketd=0;
YY_TLS_VARS;
+ buffer_state = YY_CURRENT_BUFFER;
convert_to_string(file);
memcpy(&lex_state.buffer_state,&buffer_state,sizeof(YY_BUFFER_STATE));
Index: php31/main/phpsapi_core.dsp
diff -c php31/main/phpsapi_core.dsp:2.10 php31/main/phpsapi_core.dsp:2.11
*** php31/main/phpsapi_core.dsp:2.10 Tue Sep 1 12:58:41 1998
--- php31/main/phpsapi_core.dsp Tue Sep 1 17:44:15 1998
***************
*** 133,138 ****
--- 133,146 ----
# End Source File
# Begin Source File
+ SOURCE=.\dl.c
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\dl.h
+ # End Source File
+ # Begin Source File
+
SOURCE=".\fopen-wrappers.c"
# End Source File
# Begin Source File
***************
*** 442,455 ****
# Begin Source File
SOURCE=..\ext\standard\dir.c
- # End Source File
- # Begin Source File
-
- SOURCE=..\ext\standard\dl.c
- # End Source File
- # Begin Source File
-
- SOURCE=..\ext\standard\dl.h
# End Source File
# Begin Source File
--- 450,455 ----
--
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