Branch: Tag:

1999-11-18

1999-11-18 04:14:55 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

resolved some conflicts for PHP

Rev: src/builtin_functions.h:1.10
Rev: src/errors.h:1.7
Rev: src/interpret.h:1.35
Rev: src/interpreter.h:1.18
Rev: src/lexer.h:1.11
Rev: src/preprocessor.h:1.15
Rev: src/program.c:1.174
Rev: src/program.h:1.66
Rev: src/security.h:1.8
Rev: src/svalue.h:1.38
Rev: src/threads.h:1.71

60:   #endif      DECLARE_ERROR(generic, EMPTY , -  ERR_VAR(struct pike_string *,string,T_STRING,desc) -  ERR_VAR(struct array *,array,T_ARRAY,backtrace) +  ERR_VAR(struct pike_string *,string,PIKE_T_STRING,desc) +  ERR_VAR(struct array *,array,PIKE_T_ARRAY,backtrace)    ERR_FUNC("cast",f_error_cast,tFunc(tString,tMixed),0)    ERR_FUNC("`[]",f_error_index,tFunc(tString,tMixed),0)    ERR_FUNC("describe",f_error_describe,tFunc(tVoid,tString),0)
78:      DECLARE_ERROR(bad_arg,    ERR_INHERIT(generic), -  ERR_VAR(INT_TYPE, int, T_INT, which_arg) -  ERR_VAR(struct pike_string *,string,T_STRING,expected_type) +  ERR_VAR(INT_TYPE, int, PIKE_T_INT, which_arg) +  ERR_VAR(struct pike_string *,string,PIKE_T_STRING,expected_type)    ERR_VAR(struct svalue, mixed, T_MIXED, got)   )   
90:      DECLARE_ERROR(resource,    ERR_INHERIT(generic), -  ERR_VAR(struct pike_string *,string,T_STRING,resource_type) -  ERR_VAR(INT_TYPE, int, T_INT, howmuch) +  ERR_VAR(struct pike_string *,string,PIKE_T_STRING,resource_type) +  ERR_VAR(INT_TYPE, int, PIKE_T_INT, howmuch)   )      DECLARE_ERROR(permission,    ERR_INHERIT(generic), -  ERR_VAR(struct pike_string *,string,T_STRING,permission_type) +  ERR_VAR(struct pike_string *,string,PIKE_T_STRING,permission_type)   )   #undef DECLARE_ERROR   #undef ERR_INHERIT