diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-16 13:45:06 +0100 |
| commit | db72160e5ac2b267b9ffa23ad84e62e609382a44 (patch) | |
| tree | 6e50c2826f98308d500cc826934a503751d4d566 /ext/dom/entityreference.c | |
| parent | be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 (diff) | |
| parent | f469dc7429f2257aac6f46228302408608fbd62f (diff) | |
| download | php-git-db72160e5ac2b267b9ffa23ad84e62e609382a44.tar.gz | |
Merge branch 'master' into integer_semantics
Conflicts:
Zend/zend_operators.h
Diffstat (limited to 'ext/dom/entityreference.c')
| -rw-r--r-- | ext/dom/entityreference.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/dom/entityreference.c b/ext/dom/entityreference.c index bc03385116..4e020db124 100644 --- a/ext/dom/entityreference.c +++ b/ext/dom/entityreference.c @@ -53,7 +53,7 @@ PHP_METHOD(domentityreference, __construct) xmlNodePtr oldnode = NULL; dom_object *intern; char *name; - int name_len, name_valid; + size_t name_len, name_valid; zend_error_handling error_handling; zend_replace_error_handling(EH_THROW, dom_domexception_class_entry, &error_handling TSRMLS_CC); @@ -70,7 +70,7 @@ PHP_METHOD(domentityreference, __construct) RETURN_FALSE; } - node = xmlNewReference(NULL, name); + node = xmlNewReference(NULL, (xmlChar *) name); if (!node) { php_dom_throw_error(INVALID_STATE_ERR, 1 TSRMLS_CC); |