diff options
| author | dominicc <dominicc@chromium.org> | 2016-03-03 02:34:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-03 10:35:45 +0000 |
| commit | 0b5cac87b6b7f1ad537779787240464b0f580a9c (patch) | |
| tree | 9a9a0908413a9323d462c3d58f84cf264b49cea2 /third_party/libxml/mac | |
| parent | 1b7b24793aceb615c9d54ae73c0cbbd7b9480622 (diff) | |
| download | chromium_src-0b5cac87b6b7f1ad537779787240464b0f580a9c.zip chromium_src-0b5cac87b6b7f1ad537779787240464b0f580a9c.tar.gz chromium_src-0b5cac87b6b7f1ad537779787240464b0f580a9c.tar.bz2 | |
Roll libxml to 2.9.3
BUG=587897,573332
Review URL: https://codereview.chromium.org/1752223002
Cr-Commit-Position: refs/heads/master@{#378994}
Diffstat (limited to 'third_party/libxml/mac')
| -rw-r--r-- | third_party/libxml/mac/config.h | 7 | ||||
| -rw-r--r-- | third_party/libxml/mac/include/libxml/xmlversion.h | 10 |
2 files changed, 8 insertions, 9 deletions
diff --git a/third_party/libxml/mac/config.h b/third_party/libxml/mac/config.h index 36606f0..9a1e7bf 100644 --- a/third_party/libxml/mac/config.h +++ b/third_party/libxml/mac/config.h @@ -157,7 +157,7 @@ #define HAVE_RAND 1 /* Define to 1 if you have the `rand_r' function. */ -#define HAVE_RAND_R 1 + /* Define to 1 if you have the <resolv.h> header file. */ #define HAVE_RESOLV_H 1 @@ -275,8 +275,7 @@ /* 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 to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" /* Name of package */ @@ -313,7 +312,7 @@ #define VA_LIST_IS_ARRAY 1 /* Version number of package */ -#define VERSION "2.9.2" +#define VERSION "2.9.3" /* Determine what socket length (socklen_t) data type is */ #define XML_SOCKLEN_T socklen_t diff --git a/third_party/libxml/mac/include/libxml/xmlversion.h b/third_party/libxml/mac/include/libxml/xmlversion.h index 6fd386d..bc7b4c4 100644 --- a/third_party/libxml/mac/include/libxml/xmlversion.h +++ b/third_party/libxml/mac/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.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 @@ -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) |