third_party/re2/patches/re2-android.patch

   1 diff -r cae1910ce3c5 re2/parse.cc
   2 --- a/re2/parse.cc      Mon Jul 30 16:12:46 2012 +0200
   3 +++ b/re2/parse.cc      Tue Jul 31 14:12:31 2012 +0200
   4 @@ -16,6 +16,8 @@
   5  // and recognizes the Perl escape sequences \d, \s, \w, \D, \S, and \W.
   6  // See regexp.h for rationale.
   7
   8 +#include <ctype.h>
   9 +
  10  #include "util/util.h"
  11  #include "re2/regexp.h"
  12  #include "re2/stringpiece.h"
  13 diff -r cae1910ce3c5 re2/re2.cc
  14 --- a/re2/re2.cc        Mon Jul 30 16:12:46 2012 +0200
  15 +++ b/re2/re2.cc        Tue Jul 31 14:12:31 2012 +0200
  16 @@ -9,6 +9,8 @@
  17
  18  #include "re2/re2.h"
  19
  20 +#include <ctype.h>
  21 +
  22  #include <stdio.h>
  23  #include <string>
  24  #ifdef WIN32
  25 diff -r cae1910ce3c5 util/util.h
  26 --- a/util/util.h       Mon Jul 30 16:12:46 2012 +0200
  27 +++ b/util/util.h       Tue Jul 31 14:12:31 2012 +0200
  28 @@ -28,6 +28,7 @@
  29  #include <utility>
  30  #include <set>
  31
  32 +#include "build/build_config.h"
  33  #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
  34
  35  // Use std names.
  36 @@ -44,7 +45,7 @@
  37  using std::swap;
  38  using std::make_pair;
  39
  40 -#if defined(__GNUC__) && !defined(USE_CXX0X)
  41 +#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID)
  42
  43  #include <tr1/unordered_set>
  44  using std::tr1::unordered_set;
  45 @@ -52,7 +53,7 @@
  46  #else
  47
  48  #include <unordered_set>
  49 -#ifdef WIN32
  50 +#if defined(WIN32) || defined(OS_ANDROID)
  51  using std::tr1::unordered_set;
  52  #else
  53  using std::unordered_set;