diff options
author | vsm@google.com <vsm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 00:02:33 +0000 |
---|---|---|
committer | vsm@google.com <vsm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 00:02:33 +0000 |
commit | 0a87909ee992e63975a5e81b9dde328f2740921b (patch) | |
tree | 2174f4191c0bc406141e38848aa22ea82a56b5b5 /third_party | |
parent | 113070235779bb83ef8779cdc4b392eddccf3b5a (diff) | |
download | chromium_src-0a87909ee992e63975a5e81b9dde328f2740921b.zip chromium_src-0a87909ee992e63975a5e81b9dde328f2740921b.tar.gz chromium_src-0a87909ee992e63975a5e81b9dde328f2740921b.tar.bz2 |
Import a libxml fix from upstream to make clang happy.
Review URL: http://codereview.chromium.org/9222019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r-- | third_party/libxml/README.chromium | 1 | ||||
-rw-r--r-- | third_party/libxml/src/xpath.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/third_party/libxml/README.chromium b/third_party/libxml/README.chromium index 33b674e..9dd569d 100644 --- a/third_party/libxml/README.chromium +++ b/third_party/libxml/README.chromium @@ -21,6 +21,7 @@ Modifications: - Add fixes for ending the parse properly if a SAX callback calls xmlStopParser(), commit upstream is pending. - Add fix for entities, commit upstream is http://git.gnome.org/browse/libxml2/commit/?id=5bd3c061823a8499b27422aee04ea20aae24f03e - Import UTF-8 fix from upstream: http://git.gnome.org/browse/libxml2/commit/?id=0795348aeb86648723bc391e4d02e20631c10bca +- Import XPath fix http://git.gnome.org/browse/libxml2/commit/xpath.c?id=2ddecc23862bab1a9a9e51e097aefc92ec305e28 To import a new snapshot of libxml: diff --git a/third_party/libxml/src/xpath.c b/third_party/libxml/src/xpath.c index fbacce7..4e6f29d 100644 --- a/third_party/libxml/src/xpath.c +++ b/third_party/libxml/src/xpath.c @@ -12673,7 +12673,7 @@ xmlXPathCompOpEvalFirst(xmlXPathParserContextPtr ctxt, return (total); #ifdef XP_OPTIMIZED_FILTER_FIRST case XPATH_OP_FILTER: - total =+ xmlXPathCompOpEvalFilterFirst(ctxt, op, first); + total += xmlXPathCompOpEvalFilterFirst(ctxt, op, first); return (total); #endif default: |