diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /ext/dom/namelist.c | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
Diffstat (limited to 'ext/dom/namelist.c')
| -rw-r--r-- | ext/dom/namelist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/dom/namelist.c b/ext/dom/namelist.c index 3f0b8e1640..9955cb1b6c 100644 --- a/ext/dom/namelist.c +++ b/ext/dom/namelist.c @@ -55,7 +55,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-length Since: */ -int dom_namelist_length_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_namelist_length_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; |