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

5:   \*/      /* -  * $Id: program.h,v 1.65 1999/11/04 02:35:27 grubba Exp $ +  * $Id: program.h,v 1.66 1999/11/18 04:14:52 hubbe Exp $    */   #ifndef PROGRAM_H   #define PROGRAM_H
423:   char *get_line(unsigned char *pc,struct program *prog,INT32 *linep);   void my_yyerror(char *fmt,...) ATTRIBUTE((format(printf,1,2)));   struct program *compile(struct pike_string *prog, struct object *handler); - int add_function(char *name,void (*cfun)(INT32),char *type,INT16 flags); + int pike_add_function(char *name,void (*cfun)(INT32),char *type,INT16 flags);   int quick_add_function(char *name,    int name_length,    void (*cfun)(INT32),
461:   #define ADD_INT_CONSTANT(NAME,CONST,FLAGS) \    quick_add_integer_constant(NAME,CONSTANT_STRLEN(NAME),CONST,FLAGS)    + #ifndef NO_PIKE_SHORTHAND + #define add_function pike_add_function   #endif    -  + #endif /* PROGRAM_H */ +    #ifdef DEBUG_MALLOC   #define end_program() ((struct program *)debug_malloc_pass(debug_end_program()))   #define end_class(NAME, FLAGS) do { debug_malloc_touch(new_program); debug_end_class(NAME, CONSTANT_STRLEN(NAME), FLAGS); }while(0)