summaryrefslogtreecommitdiffstats
path: root/third_party/libxml/linux
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 19:33:57 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 19:33:57 +0000
commita850e9592bb1a8c43275116ff565c91b4b1cb66b (patch)
treee2f9e64fbcfdb87a7693dcb9250e66082290cc5f /third_party/libxml/linux
parentefa0151b9f7a4389a86334ef75fa0ce138c9778e (diff)
downloadchromium_src-a850e9592bb1a8c43275116ff565c91b4b1cb66b.zip
chromium_src-a850e9592bb1a8c43275116ff565c91b4b1cb66b.tar.gz
chromium_src-a850e9592bb1a8c43275116ff565c91b4b1cb66b.tar.bz2
Update libxml to 2.7.7.
In doing so, I recreated all the patches and organized them under a patches/ subdirectory. BUG=32197 Review URL: http://codereview.chromium.org/2951008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libxml/linux')
-rw-r--r--third_party/libxml/linux/config.h46
-rw-r--r--third_party/libxml/linux/include/libxml/xmlversion.h72
-rwxr-xr-xthird_party/libxml/linux/xml2-config2
3 files changed, 94 insertions, 26 deletions
diff --git a/third_party/libxml/linux/config.h b/third_party/libxml/linux/config.h
index c2e0371..ca2f440 100644
--- a/third_party/libxml/linux/config.h
+++ b/third_party/libxml/linux/config.h
@@ -1,21 +1,21 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
#define PACKAGE "libxml2"
-#define VERSION "2.6.32"
+#define VERSION "2.7.7"
#define HAVE_LIBZ 1
/* #undef HAVE_LIBM */
-#define HAVE_ISINF
-#define HAVE_ISNAN
+#define HAVE_ISINF /**/
+#define HAVE_ISNAN /**/
/* #undef HAVE_LIBHISTORY */
/* #undef HAVE_LIBREADLINE */
-#define HAVE_LIBPTHREAD
-#define HAVE_PTHREAD_H
+#define HAVE_LIBPTHREAD /**/
+#define HAVE_PTHREAD_H /**/
/* Define if IPV6 support is there */
-#define SUPPORT_IP6
+#define SUPPORT_IP6 /**/
/* Define if getaddrinfo is there */
-#define HAVE_GETADDRINFO
+#define HAVE_GETADDRINFO /**/
/* Define to 1 if you have the <ansidecl.h> header file. */
/* #undef HAVE_ANSIDECL_H */
@@ -42,7 +42,7 @@
#define HAVE_DLFCN_H 1
/* Have dlopen based dso */
-#define HAVE_DLOPEN
+#define HAVE_DLOPEN /**/
/* Define to 1 if you have the <dl.h> header file. */
/* #undef HAVE_DL_H */
@@ -75,7 +75,7 @@
#define HAVE_FTIME 1
/* Define if getaddrinfo is there */
-#define HAVE_GETADDRINFO
+#define HAVE_GETADDRINFO /**/
/* Define to 1 if you have the `gettimeofday' function. */
#define HAVE_GETTIMEOFDAY 1
@@ -86,11 +86,14 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
+/* Define to 1 if you have the <inttypes.h.h> header file. */
+/* #undef HAVE_INTTYPES_H_H */
+
/* Define if isinf is there */
-#define HAVE_ISINF
+#define HAVE_ISINF /**/
/* Define if isnan is there */
-#define HAVE_ISNAN
+#define HAVE_ISNAN /**/
/* Define to 1 if you have the `isnand' function. */
/* #undef HAVE_ISNAND */
@@ -99,7 +102,7 @@
/* #undef HAVE_LIBHISTORY */
/* Define if pthread library is there (-lpthread) */
-#define HAVE_LIBPTHREAD
+#define HAVE_LIBPTHREAD /**/
/* Define if readline library is there (-lreadline) */
/* #undef HAVE_LIBREADLINE */
@@ -134,11 +137,14 @@
/* Define to 1 if you have the <netinet/in.h> header file. */
#define HAVE_NETINET_IN_H 1
+/* Define to 1 if you have the <poll.h> header file. */
+#define HAVE_POLL_H 1
+
/* Define to 1 if you have the `printf' function. */
#define HAVE_PRINTF 1
/* Define if <pthread.h> is there */
-#define HAVE_PTHREAD_H
+#define HAVE_PTHREAD_H /**/
/* Define to 1 if you have the <resolv.h> header file. */
#define HAVE_RESOLV_H 1
@@ -247,6 +253,13 @@
/* Whether __va_copy() is available */
/* #undef HAVE___VA_COPY */
+/* Define as const if the declaration of iconv() needs const. */
+/* #undef ICONV_CONST */
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#define LT_OBJDIR ".libs/"
+
/* Name of package */
#define PACKAGE "libxml2"
@@ -262,6 +275,9 @@
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME ""
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
/* Define to the version of this package. */
#define PACKAGE_VERSION ""
@@ -272,10 +288,10 @@
#define STDC_HEADERS 1
/* Support for IPv6 */
-#define SUPPORT_IP6
+#define SUPPORT_IP6 /**/
/* Version number of package */
-#define VERSION "2.6.32"
+#define VERSION "2.7.7"
/* Determine what socket length (socklen_t) data type is */
#define XML_SOCKLEN_T socklen_t
diff --git a/third_party/libxml/linux/include/libxml/xmlversion.h b/third_party/libxml/linux/include/libxml/xmlversion.h
index ab3fe86..9e849fa 100644
--- a/third_party/libxml/linux/include/libxml/xmlversion.h
+++ b/third_party/libxml/linux/include/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.6.32"
+#define LIBXML_DOTTED_VERSION "2.7.7"
/**
* LIBXML_VERSION:
*
* the version number: 1.2.3 value is 10203
*/
-#define LIBXML_VERSION 20632
+#define LIBXML_VERSION 20707
/**
* LIBXML_VERSION_STRING:
*
* the version number string, 1.2.3 value is "10203"
*/
-#define LIBXML_VERSION_STRING "20632"
+#define LIBXML_VERSION_STRING "20707"
/**
* 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(20632);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20707);
#ifndef VMS
#if 0
@@ -379,7 +379,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
*
* the string suffix used by dynamic modules (usually shared libraries)
*/
-#define LIBXML_MODULE_EXTENSION ".dll"
+#define LIBXML_MODULE_EXTENSION ".so"
#endif
/**
@@ -391,22 +391,74 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
#define LIBXML_ZLIB_ENABLED
#endif
+#ifdef __GNUC__
+#ifdef HAVE_ANSIDECL_H
+#include <ansidecl.h>
+#endif
+
/**
* ATTRIBUTE_UNUSED:
*
* Macro used to signal to GCC unused function parameters
*/
-#ifdef __GNUC__
-#ifdef HAVE_ANSIDECL_H
-#include <ansidecl.h>
-#endif
+
#ifndef ATTRIBUTE_UNUSED
#define ATTRIBUTE_UNUSED __attribute__((unused))
#endif
+
+/**
+ * LIBXML_ATTR_ALLOC_SIZE:
+ *
+ * Macro used to indicate to GCC this is an allocator function
+ */
+
+#ifndef LIBXML_ATTR_ALLOC_SIZE
+# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
+# define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
+# else
+# define LIBXML_ATTR_ALLOC_SIZE(x)
+# endif
#else
-#define ATTRIBUTE_UNUSED
+# define LIBXML_ATTR_ALLOC_SIZE(x)
+#endif
+
+/**
+ * LIBXML_ATTR_FORMAT:
+ *
+ * Macro used to indicate to GCC the parameter are printf like
+ */
+
+#ifndef LIBXML_ATTR_FORMAT
+# if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
+# define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args)))
+# else
+# define LIBXML_ATTR_FORMAT(fmt,args)
+# endif
+#else
+# define LIBXML_ATTR_FORMAT(fmt,args)
#endif
+#else /* ! __GNUC__ */
+/**
+ * ATTRIBUTE_UNUSED:
+ *
+ * Macro used to signal to GCC unused function parameters
+ */
+#define ATTRIBUTE_UNUSED
+/**
+ * LIBXML_ATTR_ALLOC_SIZE:
+ *
+ * Macro used to indicate to GCC this is an allocator function
+ */
+#define LIBXML_ATTR_ALLOC_SIZE(x)
+/**
+ * LIBXML_ATTR_FORMAT:
+ *
+ * Macro used to indicate to GCC the parameter are printf like
+ */
+#define LIBXML_ATTR_FORMAT(fmt,args)
+#endif /* __GNUC__ */
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/third_party/libxml/linux/xml2-config b/third_party/libxml/linux/xml2-config
index 500acaf..799fc11 100755
--- a/third_party/libxml/linux/xml2-config
+++ b/third_party/libxml/linux/xml2-config
@@ -58,7 +58,7 @@ while test $# -gt 0; do
;;
--version)
- echo 2.6.32
+ echo 2.7.7
exit 0
;;