diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-02-08 14:08:31 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-02-08 14:08:31 +0000 |
| commit | f2825042b4dd9aa941a080c027f15f41c1b9e4bc (patch) | |
| tree | 2e7d97c1dfd4aeabb506ffdd206a612b82adea8d /main/streams/streams.c | |
| parent | 0a81f9a0bd36deac8707949acbcf92f612b60e8e (diff) | |
| parent | ce9f52adcdfb19f70dc4274f3587e58ac07995bd (diff) | |
| download | php-git-f2825042b4dd9aa941a080c027f15f41c1b9e4bc.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/json.c
Diffstat (limited to 'main/streams/streams.c')
| -rw-r--r-- | main/streams/streams.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/streams/streams.c b/main/streams/streams.c index 204c33b354..f1008a6631 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -140,7 +140,7 @@ PHPAPI int php_stream_from_persistent_id(const char *persistent_id, php_stream * *stream = (php_stream*)le->ptr; if (!regentry) { /* not found in regular list */ GC_REFCOUNT(le)++; - (*stream)->res = ZEND_REGISTER_RESOURCE(NULL, *stream, le_pstream); + (*stream)->res = zend_register_resource(*stream, le_pstream); } else { GC_REFCOUNT(regentry)++; (*stream)->res = regentry; @@ -325,7 +325,7 @@ fprintf(stderr, "stream_alloc: %s:%p persistent=%s\n", ops->label, ret, persiste } } - ret->res = ZEND_REGISTER_RESOURCE(NULL, ret, persistent_id ? le_pstream : le_stream); + ret->res = zend_register_resource(ret, persistent_id ? le_pstream : le_stream); strlcpy(ret->mode, mode, sizeof(ret->mode)); ret->wrapper = NULL; @@ -2211,7 +2211,7 @@ PHPAPI php_stream_context *php_stream_context_alloc(void) context->notifier = NULL; array_init(&context->options); - context->res = ZEND_REGISTER_RESOURCE(NULL, context, php_le_stream_context()); + context->res = zend_register_resource(context, php_le_stream_context()); return context; } |