From: Thies C. Arntzen Date: Wed, 19 Jan 2000 09:38:45 +0000 (+0000) Subject: RETURN_NULL -> RETURN_NULL() // we don't want macros without an argumnet X-Git-Tag: BEFORE_SAPIFICATION_FEB_10_2000~203 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb6a1b8b83e30ad07c765227f361f96179eb94e4;p=php RETURN_NULL -> RETURN_NULL() // we don't want macros without an argumnet --- diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 823ad3b466..ff357ca153 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -191,7 +191,7 @@ ZEND_API int zend_set_hash_symbol(zval *symbol, char *name, int name_length, return_value->type = IS_BOOL; \ return_value->value.lval = b; \ } -#define RETVAL_NULL { \ +#define RETVAL_NULL() { \ return_value->type = IS_NULL; \ } #define RETVAL_LONG(l) { \ @@ -236,7 +236,7 @@ ZEND_API int zend_set_hash_symbol(zval *symbol, char *name, int name_length, return; \ } -#define RETURN_NULL { \ +#define RETURN_NULL() { \ return_value->type = IS_NULL; \ return; \ } diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c index 1b132dd5ff..9ea20da242 100644 --- a/ext/oracle/oracle.c +++ b/ext/oracle/oracle.c @@ -1385,7 +1385,7 @@ PHP_FUNCTION(ora_getcolumn) type = column->dbtype; if (column->col_retcode == 1405) { - RETURN_NULL; + RETURN_NULL(); } if (column->col_retcode != 0 && column->col_retcode != 1406) {