cvs: /php4 php.h /php4/ext/standard basic_functions.c

thies Wed Sep 15 05:51:21 1999 EDT Modified files: /php4 php.h /php4/ext/standard basic_functions.c Log: HASH_OF is usable enough (i hate duplicating macros all over the place) Index: php4/php.h diff -u php4/php.h:1.34 php4/php.h:1.35 --- php4/php.h:1.34 Wed Sep 15 05:35:20 1999 +++ php4/php.h Wed Sep 15 05:51:20 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.34 1999/09/15 09:35:20 ssb Exp $ */ +/* $Id: php.h,v 1.35 1999/09/15 09:51:20 thies Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -249,6 +249,7 @@ #define STR_FREE(ptr) if (ptr && ptr!=empty_string && ptr!=undefined_variable_string) { efree(ptr); } #define COPY_STRING(yy) (yy).value.str.val = (char *) estrndup((yy).value.str.val,(yy).value.str.len) #define STR_PRINT(str) ((str)?(str):"") +#define HASH_OF(p) ((p)->type==IS_ARRAY ? (p)->value.ht : (((p)->type==IS_OBJECT ? (p)->value.obj.properties : NULL))) #ifndef MAXPATHLEN #define MAXPATHLEN 256 /* Should be safe for any weird systems that do not define it */ Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.87 php4/ext/standard/basic_functions.c:1.88 --- php4/ext/standard/basic_functions.c:1.87 Wed Sep 15 01:08:43 1999 +++ php4/ext/standard/basic_functions.c Wed Sep 15 05:51:20 1999 @@ -18,8 +18,6 @@ */ -#define HASH_OF(p) ((p)->type==IS_ARRAY ? (p)->value.ht : (((p)->type==IS_OBJECT ? (p)->value.obj.properties : NULL))) - #include "php.h" #include "php_ini.h" #include "internal_functions_registry.h"