CVS update: php3

Date: Monday September 7, 1998 @ 12:47 Author: shane Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv17341 Modified Files: language-parser.y variables.c variables.h Log Message: remove printf output in parser for release compiles fix big API problem in variables.c that was causing a problem in mssql module backporting mssql from 3.1. Index: php3/language-parser.y diff -c php3/language-parser.y:1.171 php3/language-parser.y:1.172 *** php3/language-parser.y:1.171 Tue Sep 1 00:44:51 1998 --- php3/language-parser.y Mon Sep 7 12:47:20 1998 *************** *** 31,37 **** */ ! /* $Id: language-parser.y,v 1.171 1998/09/01 04:44:51 zeev Exp $ */ /* --- 31,37 ---- */ ! /* $Id: language-parser.y,v 1.172 1998/09/07 16:47:20 shane Exp $ */ /* *************** *** 165,171 **** --- 165,173 ---- int clean_module_resource(list_entry *le, int *resource_id) { if (le->type == *resource_id) { + #if DEBUG printf("Cleaning resource %d\n",*resource_id); + #endif return 1; } else { return 0; Index: php3/variables.c diff -c php3/variables.c:1.150 php3/variables.c:1.151 *** php3/variables.c:1.150 Mon Aug 10 15:19:40 1998 --- php3/variables.c Mon Sep 7 12:47:21 1998 *************** *** 29,35 **** */ ! /* $Id: variables.c,v 1.150 1998/08/10 19:19:40 fmk Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 29,35 ---- */ ! /* $Id: variables.c,v 1.151 1998/09/07 16:47:21 shane Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 70,76 **** var->value.str.len = 0; } ! PHPAPI inline void yystype_destructor(pval *yystype INLINE_TLS) { if (yystype->type == IS_STRING) { STR_FREE(yystype->value.str.val); --- 70,83 ---- var->value.str.len = 0; } ! void php3_yystype_destructor(pval *yystype) ! { ! TLS_VARS; ! ! yystype_destructor(yystype _INLINE_TLS); ! } ! ! inline void yystype_destructor(pval *yystype INLINE_TLS) { if (yystype->type == IS_STRING) { STR_FREE(yystype->value.str.val); Index: php3/variables.h diff -c php3/variables.h:1.47 php3/variables.h:1.48 *** php3/variables.h:1.47 Mon Aug 10 15:19:41 1998 --- php3/variables.h Mon Sep 7 12:47:22 1998 *************** *** 29,35 **** */ ! /* $Id: variables.h,v 1.47 1998/08/10 19:19:41 fmk Exp $ */ #ifndef _VARIABLES_H --- 29,35 ---- */ ! /* $Id: variables.h,v 1.48 1998/09/07 16:47:22 shane Exp $ */ #ifndef _VARIABLES_H *************** *** 53,59 **** extern void get_object_symtable(pval *result, pval *parent, pval *child INLINE_TLS); extern void assign_new_object(pval *result, pval *classname, unsigned char implicit_ctor INLINE_TLS); ! extern PHPAPI void yystype_destructor(pval *yystype INLINE_TLS); extern PHPAPI int yystype_copy_constructor(pval *yystype); #define pval_DESTRUCTOR (void (*)(void *)) yystype_destructor #define pval_COPY_CTOR (void (*)(void *)) yystype_copy_constructor --- 53,60 ---- extern void get_object_symtable(pval *result, pval *parent, pval *child INLINE_TLS); extern void assign_new_object(pval *result, pval *classname, unsigned char implicit_ctor INLINE_TLS); ! extern PHPAPI void php3_yystype_destructor(pval *yystype); ! extern void yystype_destructor(pval *yystype INLINE_TLS); extern PHPAPI int yystype_copy_constructor(pval *yystype); #define pval_DESTRUCTOR (void (*)(void *)) yystype_destructor #define pval_COPY_CTOR (void (*)(void *)) yystype_copy_constructor -- 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