pike.git/ src/ program.c

1999-11-18

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

• 0542efb131be1e2efe85086c86370cec4bc123d2 (5 lines) (+3/-2) ^{[ Show | Annotate ]}
  Branch: 7.9

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:   \*/   /**/   #include "global.h" - RCSID("$Id: program.c,v 1.173 1999/11/18 02:46:04 mast Exp $"); + RCSID("$Id: program.c,v 1.174 1999/11/18 04:14:50 hubbe Exp $");   #include "program.h"   #include "object.h"   #include "dynamic_buffer.h"
2875:    return p;   }    - 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 ret;    struct pike_string *name_tmp,*type_tmp;