update to 2.9.3

rwinlib · Mar 3, 2016 · 34ad720 · 34ad720
1 parent dbb1c71
commit 34ad720
Show file tree

Hide file tree

Showing 55 changed files with 10 additions and 251 deletions.
diff --git a/include/libxml/DOCBparser.h → include/libxml2/libxml/DOCBparser.h b/include/libxml/DOCBparser.h → include/libxml2/libxml/DOCBparser.h
diff --git a/include/libxml/HTMLparser.h → include/libxml2/libxml/HTMLparser.h b/include/libxml/HTMLparser.h → include/libxml2/libxml/HTMLparser.h
diff --git a/include/libxml/HTMLtree.h → include/libxml2/libxml/HTMLtree.h b/include/libxml/HTMLtree.h → include/libxml2/libxml/HTMLtree.h
diff --git a/include/libxml/SAX.h → include/libxml2/libxml/SAX.h b/include/libxml/SAX.h → include/libxml2/libxml/SAX.h
diff --git a/include/libxml/SAX2.h → include/libxml2/libxml/SAX2.h b/include/libxml/SAX2.h → include/libxml2/libxml/SAX2.h
diff --git a/include/libxml/c14n.h → include/libxml2/libxml/c14n.h b/include/libxml/c14n.h → include/libxml2/libxml/c14n.h
diff --git a/include/libxml/catalog.h → include/libxml2/libxml/catalog.h b/include/libxml/catalog.h → include/libxml2/libxml/catalog.h
diff --git a/include/libxml/chvalid.h → include/libxml2/libxml/chvalid.h b/include/libxml/chvalid.h → include/libxml2/libxml/chvalid.h
diff --git a/include/libxml/debugXML.h → include/libxml2/libxml/debugXML.h b/include/libxml/debugXML.h → include/libxml2/libxml/debugXML.h
diff --git a/include/libxml/dict.h → include/libxml2/libxml/dict.h b/include/libxml/dict.h → include/libxml2/libxml/dict.h
diff --git a/include/libxml/encoding.h → include/libxml2/libxml/encoding.h b/include/libxml/encoding.h → include/libxml2/libxml/encoding.h
diff --git a/include/libxml/entities.h → include/libxml2/libxml/entities.h b/include/libxml/entities.h → include/libxml2/libxml/entities.h
diff --git a/include/libxml/globals.h → include/libxml2/libxml/globals.h b/include/libxml/globals.h → include/libxml2/libxml/globals.h
diff --git a/include/libxml/hash.h → include/libxml2/libxml/hash.h b/include/libxml/hash.h → include/libxml2/libxml/hash.h
diff --git a/include/libxml/list.h → include/libxml2/libxml/list.h b/include/libxml/list.h → include/libxml2/libxml/list.h
diff --git a/include/libxml/nanoftp.h → include/libxml2/libxml/nanoftp.h b/include/libxml/nanoftp.h → include/libxml2/libxml/nanoftp.h
diff --git a/include/libxml/nanohttp.h → include/libxml2/libxml/nanohttp.h b/include/libxml/nanohttp.h → include/libxml2/libxml/nanohttp.h
diff --git a/include/libxml/parser.h → include/libxml2/libxml/parser.h b/include/libxml/parser.h → include/libxml2/libxml/parser.h
diff --git a/include/libxml/parserInternals.h → include/libxml2/libxml/parserInternals.h b/include/libxml/parserInternals.h → include/libxml2/libxml/parserInternals.h
diff --git a/include/libxml/pattern.h → include/libxml2/libxml/pattern.h b/include/libxml/pattern.h → include/libxml2/libxml/pattern.h
diff --git a/include/libxml/relaxng.h → include/libxml2/libxml/relaxng.h b/include/libxml/relaxng.h → include/libxml2/libxml/relaxng.h
diff --git a/include/libxml/schemasInternals.h → include/libxml2/libxml/schemasInternals.h b/include/libxml/schemasInternals.h → include/libxml2/libxml/schemasInternals.h
diff --git a/include/libxml/schematron.h → include/libxml2/libxml/schematron.h b/include/libxml/schematron.h → include/libxml2/libxml/schematron.h
diff --git a/include/libxml/threads.h → include/libxml2/libxml/threads.h b/include/libxml/threads.h → include/libxml2/libxml/threads.h
diff --git a/include/libxml/tree.h → include/libxml2/libxml/tree.h b/include/libxml/tree.h → include/libxml2/libxml/tree.h
@@ -76,7 +76,8 @@ typedef enum {
     XML_BUFFER_ALLOC_EXACT,	/* grow only to the minimal size */
     XML_BUFFER_ALLOC_IMMUTABLE, /* immutable buffer */
     XML_BUFFER_ALLOC_IO,	/* special allocation scheme used for I/O */
-    XML_BUFFER_ALLOC_HYBRID	/* exact up to a threshold, and doubleit thereafter */
+    XML_BUFFER_ALLOC_HYBRID,	/* exact up to a threshold, and doubleit thereafter */
+    XML_BUFFER_ALLOC_BOUNDED	/* limit the upper size of the buffer */
 } xmlBufferAllocationScheme;
 
 /**

diff --git a/include/libxml/uri.h → include/libxml2/libxml/uri.h b/include/libxml/uri.h → include/libxml2/libxml/uri.h
diff --git a/include/libxml/valid.h → include/libxml2/libxml/valid.h b/include/libxml/valid.h → include/libxml2/libxml/valid.h
diff --git a/include/libxml/xinclude.h → include/libxml2/libxml/xinclude.h b/include/libxml/xinclude.h → include/libxml2/libxml/xinclude.h
diff --git a/include/libxml/xlink.h → include/libxml2/libxml/xlink.h b/include/libxml/xlink.h → include/libxml2/libxml/xlink.h
diff --git a/include/libxml/xmlIO.h → include/libxml2/libxml/xmlIO.h b/include/libxml/xmlIO.h → include/libxml2/libxml/xmlIO.h
diff --git a/include/libxml/xmlautomata.h → include/libxml2/libxml/xmlautomata.h b/include/libxml/xmlautomata.h → include/libxml2/libxml/xmlautomata.h
diff --git a/include/libxml/xmlerror.h → include/libxml2/libxml/xmlerror.h b/include/libxml/xmlerror.h → include/libxml2/libxml/xmlerror.h
diff --git a/include/libxml/xmlexports.h → include/libxml2/libxml/xmlexports.h b/include/libxml/xmlexports.h → include/libxml2/libxml/xmlexports.h
diff --git a/include/libxml/xmlmemory.h → include/libxml2/libxml/xmlmemory.h b/include/libxml/xmlmemory.h → include/libxml2/libxml/xmlmemory.h
diff --git a/include/libxml/xmlmodule.h → include/libxml2/libxml/xmlmodule.h b/include/libxml/xmlmodule.h → include/libxml2/libxml/xmlmodule.h
diff --git a/include/libxml/xmlreader.h → include/libxml2/libxml/xmlreader.h b/include/libxml/xmlreader.h → include/libxml2/libxml/xmlreader.h
diff --git a/include/libxml/xmlregexp.h → include/libxml2/libxml/xmlregexp.h b/include/libxml/xmlregexp.h → include/libxml2/libxml/xmlregexp.h
diff --git a/include/libxml/xmlsave.h → include/libxml2/libxml/xmlsave.h b/include/libxml/xmlsave.h → include/libxml2/libxml/xmlsave.h
diff --git a/include/libxml/xmlschemas.h → include/libxml2/libxml/xmlschemas.h b/include/libxml/xmlschemas.h → include/libxml2/libxml/xmlschemas.h
diff --git a/include/libxml/xmlschemastypes.h → include/libxml2/libxml/xmlschemastypes.h b/include/libxml/xmlschemastypes.h → include/libxml2/libxml/xmlschemastypes.h
diff --git a/include/libxml/xmlstring.h → include/libxml2/libxml/xmlstring.h b/include/libxml/xmlstring.h → include/libxml2/libxml/xmlstring.h
diff --git a/include/libxml/xmlunicode.h → include/libxml2/libxml/xmlunicode.h b/include/libxml/xmlunicode.h → include/libxml2/libxml/xmlunicode.h
diff --git a/include/libxml/xmlversion.h → include/libxml2/libxml/xmlversion.h b/include/libxml/xmlversion.h → include/libxml2/libxml/xmlversion.h
@@ -29,21 +29,21 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.9.2"
+#define LIBXML_DOTTED_VERSION "2.9.3"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 20902
+#define LIBXML_VERSION 20903
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "20902"
+#define LIBXML_VERSION_STRING "20903"
 
 /**
  * LIBXML_VERSION_EXTRA:
@@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(20902);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20903);
 
 #ifndef VMS
 #if 0
@@ -405,7 +405,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  *
  * Whether the Lzma support is compiled in
  */
-#if 0
+#if 1
 #define LIBXML_LZMA_ENABLED
 #endif
 
@@ -435,7 +435,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
  */
 
 #ifndef LIBXML_ATTR_ALLOC_SIZE
-# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
+# if (!defined(__clang__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))))
 #  define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
 # else
 #  define LIBXML_ATTR_ALLOC_SIZE(x)

diff --git a/include/libxml/xmlwriter.h → include/libxml2/libxml/xmlwriter.h b/include/libxml/xmlwriter.h → include/libxml2/libxml/xmlwriter.h
diff --git a/include/libxml/xpath.h → include/libxml2/libxml/xpath.h b/include/libxml/xpath.h → include/libxml2/libxml/xpath.h
diff --git a/include/libxml/xpathInternals.h → include/libxml2/libxml/xpathInternals.h b/include/libxml/xpathInternals.h → include/libxml2/libxml/xpathInternals.h
diff --git a/include/libxml/xpointer.h → include/libxml2/libxml/xpointer.h b/include/libxml/xpointer.h → include/libxml2/libxml/xpointer.h
diff --git a/include/win32config.h b/include/win32config.h
diff --git a/include/wsockcompat.h b/include/wsockcompat.h
diff --git a/lib/.DS_Store b/lib/.DS_Store
diff --git a/lib/i386/liblzma.a b/lib/i386/liblzma.a
diff --git a/lib/i386/libxml2.a b/lib/i386/libxml2.a
diff --git a/lib/x64/liblzma.a b/lib/x64/liblzma.a
diff --git a/lib/x64/libxml2.a b/lib/x64/libxml2.a
diff --git a/readme.md b/readme.md
@@ -1,30 +1,2 @@
-Both versions were compiled with msys and gcc 4.6.3 from Rtools 3.1. 
-Simply extract libxml2 dir and use:
-
-```bash
-CFLAGS="-m32" ./configure
-make
-```
-
-Or for x64:
-
-```bash
-CFLAGS="-m64" ./configure
-make 
-```
-
-**Important:** Some versions of mingw give this error when linking the static library:
-
-```
-undefined reference to `_imp__xmlFree'
-```
-
-To fix this, you need to pass `-DIN_LIBXML` when compiling your **client**. See this [comment](https://github.com/GNOME/libxml2/blob/v2.9.2/include/libxml/xmlexports.h#L111-L115).
-Example `Makevars.win` file:
-
-```Make
-LIB_XML="../windows/libxml2-2.9.2"
-PKG_CPPFLAGS= -I${LIB_XML}/include -DIN_LIBXML
-PKG_LIBS= -L${LIB_XML}/lib${R_ARCH} -lxml2 -liconv -lz -lws2_32
-```
-
+Patched libxml2 versions from msys2.
+Client must build with `-DLIBXML_STATIC` to link against static libraries.