merged tag ooo/DEV300_m102
[LibreOffice.git] / libxml2 / libxml2-gnome599717.patch
blobcc6617d0e699e1f5afd8b3b2ee798b05ee46e4c9
1 --- misc/libxml2-2.7.6/relaxng.c 2009-12-17 11:53:12.000000000 +0000
2 +++ misc/build/libxml2-2.7.6/relaxng.c 2009-12-17 16:30:43.000000000 +0000
3 @@ -5369,7 +5369,7 @@
4 } else {
5 xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT,
6 "expecting name, anyName, nsName or choice : got %s\n",
7 - (node == NULL ? "nothing" : node->name), NULL);
8 + (node == NULL ? BAD_CAST "nothing" : node->name), NULL);
9 return (NULL);
11 if (ret != def) {
12 @@ -9459,7 +9459,7 @@
13 ctxt->states = NULL;
14 if (found == 0) {
15 if (cur == NULL) {
16 - VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname");
17 + VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, BAD_CAST "noname");
18 } else {
19 VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name);