diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2009-12-17 16:34:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2009-12-17 16:34:12 +0000 |
| commit | 8b965b5e2fec161c1d91e5b880f6065437e806b9 (patch) | |
| tree | 034faeeb925971478d053d2f1339cc9189bd64d7 /libxml2 | |
| parent | 341ff020c7f4ed1e3a50536475ed65efcac4f0ec (diff) | |
xmlsec1_2_14: #i107747#: fix missing casts on sun studio
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/libxml2-badcasts.patch | 20 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 3 |
2 files changed, 22 insertions, 1 deletions
diff --git a/libxml2/libxml2-badcasts.patch b/libxml2/libxml2-badcasts.patch new file mode 100644 index 000000000000..cc6617d0e699 --- /dev/null +++ b/libxml2/libxml2-badcasts.patch @@ -0,0 +1,20 @@ +--- misc/libxml2-2.7.6/relaxng.c 2009-12-17 11:53:12.000000000 +0000 ++++ misc/build/libxml2-2.7.6/relaxng.c 2009-12-17 16:30:43.000000000 +0000 +@@ -5369,7 +5369,7 @@ + } else { + xmlRngPErr(ctxt, node, XML_RNGP_CHOICE_CONTENT, + "expecting name, anyName, nsName or choice : got %s\n", +- (node == NULL ? "nothing" : node->name), NULL); ++ (node == NULL ? BAD_CAST "nothing" : node->name), NULL); + return (NULL); + } + if (ret != def) { +@@ -9459,7 +9459,7 @@ + ctxt->states = NULL; + if (found == 0) { + if (cur == NULL) { +- VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, "noname"); ++ VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, BAD_CAST "noname"); + } else { + VALID_ERR2(XML_RELAXNG_ERR_INTEREXTRA, cur->name); + } diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 52218fb1e580..abe051c210b1 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -50,7 +50,8 @@ LIBXML2VERSION=2.7.6 TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION) PATCH_FILES=libxml2-configure.patch \ - libxml2-mingw.patch + libxml2-mingw.patch \ + libxml2-badcasts.patch # This is only for UNX environment now |