projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
-fix macro parameter passing in HTTP_LOG_WRITE
[m6w6/ext-http]
/
php_http_std_defs.h
diff --git
a/php_http_std_defs.h
b/php_http_std_defs.h
index 763a8cf0b3c11255dabfc0be2987fc5c352ba18e..bcd91acd3ad752ca86930cfe80ffb7a6450004f3 100644
(file)
--- a/
php_http_std_defs.h
+++ b/
php_http_std_defs.h
@@
-62,15
+62,17
@@
typedef int STATUS;
RETVAL_OBJECT(o); \
return
#define RETVAL_OBJVAL(ov) \
RETVAL_OBJECT(o); \
return
#define RETVAL_OBJVAL(ov) \
- return_value->is_ref = 1; \
- return_value->type = IS_OBJECT; \
- return_value->value.obj = (ov); \
- if (Z_OBJ_HT_P(return_value)) { \
- Z_OBJ_HT_P(return_value)->add_ref(return_value TSRMLS_CC); \
- }
+ ZVAL_OBJVAL(return_value, ov)
#define RETURN_OBJVAL(ov) \
RETVAL_OBJVAL(ov); \
return
#define RETURN_OBJVAL(ov) \
RETVAL_OBJVAL(ov); \
return
+#define ZVAL_OBJVAL(zv, ov) \
+ (zv)->is_ref = 1; \
+ (zv)->type = IS_OBJECT; \
+ (zv)->value.obj = (ov); \
+ if (Z_OBJ_HT_P(zv)->add_ref) { \
+ Z_OBJ_HT_P(zv)->add_ref((zv) TSRMLS_CC); \
+ }
/* function accepts no args */
#define NO_ARGS \
/* function accepts no args */
#define NO_ARGS \