diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-25 21:21:16 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-25 21:52:18 +0200 |
| commit | 6db293d5e043d35c281a6b11cb68460f5d7188a9 (patch) | |
| tree | d1880c1810fe147de6ff7f8ff317b4ec300a518f /ext/xmlreader/php_xmlreader.c | |
| parent | 7813d85d3d5901b24f77b63538eb6754e161f471 (diff) | |
| parent | 455741fce3c4f4392deb97775cba7a39f6490271 (diff) | |
| download | php-git-6db293d5e043d35c281a6b11cb68460f5d7188a9.tar.gz | |
Merge remote-tracking branch 'php-src/master' into ast
Conflicts:
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_globals.h
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_types.h
Diffstat (limited to 'ext/xmlreader/php_xmlreader.c')
| -rw-r--r-- | ext/xmlreader/php_xmlreader.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c index 443fca3355..0b55caa357 100644 --- a/ext/xmlreader/php_xmlreader.c +++ b/ext/xmlreader/php_xmlreader.c @@ -561,7 +561,7 @@ Get value of an attribute at index from current element */ PHP_METHOD(xmlreader, getAttributeNo) { zval *id; - long attr_pos; + zend_long attr_pos; char *retchar = NULL; xmlreader_object *intern; @@ -618,7 +618,7 @@ Indicates whether given property (one of the parser option constants) is set or PHP_METHOD(xmlreader, getParserProperty) { zval *id; - long property; + zend_long property; int retval = -1; xmlreader_object *intern; @@ -697,7 +697,7 @@ Returns TRUE on success and FALSE on failure */ PHP_METHOD(xmlreader, moveToAttributeNo) { zval *id; - long attr_pos; + zend_long attr_pos; int retval; xmlreader_object *intern; @@ -847,7 +847,7 @@ PHP_METHOD(xmlreader, open) { zval *id; int source_len = 0, encoding_len = 0; - long options = 0; + zend_long options = 0; xmlreader_object *intern = NULL; char *source, *valid_file = NULL; char *encoding = NULL; @@ -978,7 +978,7 @@ Properties must be set after open() or XML() and before the first read() is call PHP_METHOD(xmlreader, setParserProperty) { zval *id; - long property; + zend_long property; int retval = -1; zend_bool value; xmlreader_object *intern; @@ -1030,7 +1030,7 @@ PHP_METHOD(xmlreader, XML) { zval *id; int source_len = 0, encoding_len = 0; - long options = 0; + zend_long options = 0; xmlreader_object *intern = NULL; char *source, *uri = NULL, *encoding = NULL; int resolved_path_len, ret = 0; |