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/documentfragment.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/documentfragment.c')
| -rw-r--r-- | ext/dom/documentfragment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c index f20ada3db4..ac2c8e4ea8 100644 --- a/ext/dom/documentfragment.c +++ b/ext/dom/documentfragment.c @@ -122,7 +122,7 @@ PHP_METHOD(domdocumentfragment, appendXML) { xmlNode *nodep; dom_object *intern; char *data = NULL; - int data_len = 0; + size_t data_len = 0; int err; xmlNodePtr lst; @@ -138,7 +138,7 @@ PHP_METHOD(domdocumentfragment, appendXML) { } if (data) { - err = xmlParseBalancedChunkMemory(nodep->doc, NULL, NULL, 0, data, &lst); + err = xmlParseBalancedChunkMemory(nodep->doc, NULL, NULL, 0, (xmlChar *) data, &lst); if (err != 0) { RETURN_FALSE; } |