Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: third_party/re2/patches/re2-android.patch

Issue 10575037: Include RE2 library (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Less intrusive fix for Android Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/re2/patches/re2-android.patch
diff --git a/third_party/re2/patches/re2-android.patch b/third_party/re2/patches/re2-android.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a622035bd85fd112a99145d15f1d756d9dfda611
--- /dev/null
+++ b/third_party/re2/patches/re2-android.patch
@@ -0,0 +1,53 @@
+diff -r cae1910ce3c5 re2/parse.cc
+--- a/re2/parse.cc Mon Jul 30 16:12:46 2012 +0200
++++ b/re2/parse.cc Tue Jul 31 14:12:31 2012 +0200
+@@ -16,6 +16,8 @@
+ // and recognizes the Perl escape sequences \d, \s, \w, \D, \S, and \W.
+ // See regexp.h for rationale.
+
++#include <ctype.h>
++
+ #include "util/util.h"
+ #include "re2/regexp.h"
+ #include "re2/stringpiece.h"
+diff -r cae1910ce3c5 re2/re2.cc
+--- a/re2/re2.cc Mon Jul 30 16:12:46 2012 +0200
++++ b/re2/re2.cc Tue Jul 31 14:12:31 2012 +0200
+@@ -9,6 +9,8 @@
+
+ #include "re2/re2.h"
+
++#include <ctype.h>
++
+ #include <stdio.h>
+ #include <string>
+ #ifdef WIN32
+diff -r cae1910ce3c5 util/util.h
+--- a/util/util.h Mon Jul 30 16:12:46 2012 +0200
++++ b/util/util.h Tue Jul 31 14:12:31 2012 +0200
+@@ -28,6 +28,7 @@
+ #include <utility>
+ #include <set>
+
++#include "build/build_config.h"
+ #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
+
+ // Use std names.
+@@ -44,7 +45,7 @@
+ using std::swap;
+ using std::make_pair;
+
+-#if defined(__GNUC__) && !defined(USE_CXX0X)
++#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID)
+
+ #include <tr1/unordered_set>
+ using std::tr1::unordered_set;
+@@ -52,7 +53,7 @@
+ #else
+
+ #include <unordered_set>
+-#ifdef WIN32
++#if defined(WIN32) || defined(OS_ANDROID)
+ using std::tr1::unordered_set;
+ #else
+ using std::unordered_set;
« no previous file with comments | « third_party/re2/patches/fix-implicit-conversion.patch ('k') | third_party/re2/patches/re2-msvc9-chrome.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698