Module Name: src
Committed By: tron
Date: Sat Feb 11 18:22:59 UTC 2012
Modified Files:
src/external/mit/expat/dist/conftools: ac_c_bigendian_cross.m4
mkinstalldirs
src/external/mit/expat/dist/lib: xmlparse.c xmltok_impl.c
Log Message:
Re-apply NetBSD patches.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 \
src/external/mit/expat/dist/conftools/mkinstalldirs
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/expat/dist/lib/xmlparse.c \
src/external/mit/expat/dist/lib/xmltok_impl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4
diff -u src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.1.1.1 src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.2
--- src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.1.1.1 Sat Feb 11 18:18:21 2012
+++ src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 Sat Feb 11 18:22:58 2012
@@ -7,7 +7,7 @@ dnl The implementation will create a bin
dnl the binary it will be grep'ed for some symbols that will look
dnl different for different endianess of the binary.
dnl
-dnl @version $Id: ac_c_bigendian_cross.m4,v 1.1.1.1 2012/02/11 18:18:21 tron Exp $
+dnl @version $Id: ac_c_bigendian_cross.m4,v 1.2 2012/02/11 18:22:58 tron Exp $
dnl @author Guido Draheim <gui...@gmx.de>
dnl
AC_DEFUN([AC_C_BIGENDIAN_CROSS],
Index: src/external/mit/expat/dist/conftools/mkinstalldirs
diff -u src/external/mit/expat/dist/conftools/mkinstalldirs:1.1.1.1 src/external/mit/expat/dist/conftools/mkinstalldirs:1.2
--- src/external/mit/expat/dist/conftools/mkinstalldirs:1.1.1.1 Sat Feb 11 18:18:21 2012
+++ src/external/mit/expat/dist/conftools/mkinstalldirs Sat Feb 11 18:22:58 2012
@@ -4,7 +4,7 @@
# Created: 1993-05-16
# Public domain
-# $Id: mkinstalldirs,v 1.1.1.1 2012/02/11 18:18:21 tron Exp $
+# $Id: mkinstalldirs,v 1.2 2012/02/11 18:22:58 tron Exp $
errstatus=0
Index: src/external/mit/expat/dist/lib/xmlparse.c
diff -u src/external/mit/expat/dist/lib/xmlparse.c:1.1.1.1 src/external/mit/expat/dist/lib/xmlparse.c:1.2
--- src/external/mit/expat/dist/lib/xmlparse.c:1.1.1.1 Sat Feb 11 18:18:19 2012
+++ src/external/mit/expat/dist/lib/xmlparse.c Sat Feb 11 18:22:58 2012
@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser,
return XML_ERROR_UNCLOSED_TOKEN;
case XML_TOK_PARTIAL_CHAR:
return XML_ERROR_PARTIAL_CHAR;
+ case -XML_TOK_PROLOG_S:
+ tok = -tok;
+ break;
case XML_TOK_NONE:
#ifdef XML_DTD
/* for internal PE NOT referenced between declarations */
Index: src/external/mit/expat/dist/lib/xmltok_impl.c
diff -u src/external/mit/expat/dist/lib/xmltok_impl.c:1.1.1.1 src/external/mit/expat/dist/lib/xmltok_impl.c:1.2
--- src/external/mit/expat/dist/lib/xmltok_impl.c:1.1.1.1 Sat Feb 11 18:18:19 2012
+++ src/external/mit/expat/dist/lib/xmltok_impl.c Sat Feb 11 18:22:58 2012
@@ -1744,7 +1744,7 @@ PREFIX(updatePosition)(const ENCODING *e
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr < end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \
