CVS update: php3

Date: Friday May 14, 1999 @ 6:00 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv2515 Modified Files: configure.in language-parser.y Log Message: - add common MySQL location - don't access pval after its destruction Index: php3/configure.in diff -u php3/configure.in:1.357 php3/configure.in:1.358 --- php3/configure.in:1.357 Wed May 12 18:52:01 1999 +++ php3/configure.in Fri May 14 06:00:24 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.357 1999/05/12 22:52:01 timothy Exp $ +dnl $Id: configure.in,v 1.358 1999/05/14 10:00:24 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -1169,6 +1169,9 @@ elif test -f /usr/local/include/mysql.h; then MYSQL_INCDIR=/usr/local/include MYSQL_LIBDIR=/usr/local/lib + elif test -f /usr/local/mysql/include/mysql/mysql.h; then + MYSQL_INCDIR=/usr/local/mysql/include/mysql + MYSQL_LIBDIR=/usr/local/mysql/lib/mysql else AC_MSG_RESULT(no) AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h) Index: php3/language-parser.y diff -u php3/language-parser.y:1.179 php3/language-parser.y:1.180 --- php3/language-parser.y:1.179 Thu May 13 16:15:07 1999 +++ php3/language-parser.y Fri May 14 06:00:24 1999 @@ -31,7 +31,7 @@ */ -/* $Id: language-parser.y,v 1.179 1999/05/13 20:15:07 sas Exp $ */ +/* $Id: language-parser.y,v 1.180 1999/05/14 10:00:24 sas Exp $ */ /* @@ -550,7 +550,7 @@ | OBJECT_CAST expr { if (GLOBAL(Execute)) { convert_to_object(&$2); $$ = $2; } } | EXIT { if (GLOBAL(Execute)) { php3_header(); GLOBAL(shutdown_requested)=ABNORMAL_SHUTDOWN; $$.type=IS_LONG; $$.value.lval=1; } } | EXIT '(' ')' { if (GLOBAL(Execute)) { php3_header(); GLOBAL(shutdown_requested)=ABNORMAL_SHUTDOWN; $$.type=IS_LONG; $$.value.lval=1; } } - | EXIT '(' expr ')' { if (GLOBAL(Execute)) { if (php3_header()) { convert_to_string(&$3); PUTS($3.value.str.val); pval_destructor(&$3 _INLINE_TLS); } GLOBAL(shutdown_requested)=ABNORMAL_SHUTDOWN; convert_to_long(&$3); wanted_exit_status = $3.value.lval; $$.type=IS_LONG; $$.value.lval=1; } } + | EXIT '(' expr ')' { if (GLOBAL(Execute)) { if (php3_header()) { convert_to_string(&$3); PUTS($3.value.str.val); convert_to_long(&$3); wanted_exit_status = $3.value.lval; pval_destructor(&$3 _INLINE_TLS); } GLOBAL(shutdown_requested)=ABNORMAL_SHUTDOWN; $$.type=IS_LONG; $$.value.lval=1; } } | '@' { $1.cs_data.error_reporting=GLOBAL(error_reporting); GLOBAL(error_reporting)=0; } expr { GLOBAL(error_reporting)=$1.cs_data.error_reporting; $$ = $3; } | '@' error { php3_error(E_ERROR,"@ operator may only be used on expressions"); } | scalar { if (GLOBAL(Execute)) $$ = $1; } -- 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