pike.git/ src/ builtin_functions.h

1999-11-18

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

• 0542efb131be1e2efe85086c86370cec4bc123d2 (15 lines) (+8/-7) ^{[ 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:   \*/      /* -  * $Id: builtin_functions.h,v 1.9 1999/05/11 18:56:34 mirar Exp $ +  * $Id: builtin_functions.h,v 1.10 1999/11/18 04:14:44 hubbe Exp $    */   #ifndef BUILTIN_EFUNS_H   #define BUILTIN_EFUNS_H
67:   void f_sleep(INT32 args);   void f_gc(INT32 args);   void f_programp(INT32 args); - TYPEP(f_intp, "intpp", T_INT) - TYPEP(f_mappingp, "mappingp", T_MAPPING) - TYPEP(f_arrayp, "arrayp", T_ARRAY) - TYPEP(f_multisetp, "multisetp", T_MULTISET) - TYPEP(f_stringp, "stringp", T_STRING) - TYPEP(f_floatp, "floatp", T_FLOAT) + TYPEP(f_intp, "intpp", PIKE_T_INT) + TYPEP(f_mappingp, "mappingp", PIKE_T_MAPPING) + TYPEP(f_arrayp, "arrayp", PIKE_T_ARRAY) + TYPEP(f_multisetp, "multisetp", PIKE_T_MULTISET) + TYPEP(f_stringp, "stringp", PIKE_T_STRING) + TYPEP(f_floatp, "floatp", PIKE_T_FLOAT)   void f_sort(INT32 args);   void f_rows(INT32 args);   void f_column(INT32 args);