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/domlocator.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/domlocator.c')
| -rw-r--r-- | ext/dom/domlocator.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/dom/domlocator.c b/ext/dom/domlocator.c index 8fdd326fcc..e3f3ecf3b0 100644 --- a/ext/dom/domlocator.c +++ b/ext/dom/domlocator.c @@ -46,7 +46,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-line-number Since: */ -int dom_domlocator_line_number_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domlocator_line_number_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -59,7 +59,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-column-number Since: */ -int dom_domlocator_column_number_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domlocator_column_number_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -72,7 +72,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-offset Since: */ -int dom_domlocator_offset_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domlocator_offset_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -85,7 +85,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-node Since: */ -int dom_domlocator_related_node_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domlocator_related_node_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; @@ -98,7 +98,7 @@ readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-uri Since: */ -int dom_domlocator_uri_read(dom_object *obj, zval *retval TSRMLS_DC) +int dom_domlocator_uri_read(dom_object *obj, zval *retval) { ZVAL_STRING(retval, "TEST"); return SUCCESS; |