diff options
| author | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 03:31:33 +0000 |
|---|---|---|
| committer | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 03:31:33 +0000 |
| commit | 69030f44c1e7afe16efe96c1698464874f541aae (patch) | |
| tree | df2376d45324bb8d8f540bfaf9cc5296ea68ca2c /third_party/protobuf | |
| parent | 57f5c1e4139188adca320f5389f3a6f39ef047c8 (diff) | |
| download | chromium_src-69030f44c1e7afe16efe96c1698464874f541aae.zip chromium_src-69030f44c1e7afe16efe96c1698464874f541aae.tar.gz chromium_src-69030f44c1e7afe16efe96c1698464874f541aae.tar.bz2 | |
Upstream: Third-party change to build net_unittests for Android.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8547010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/protobuf')
| -rw-r--r-- | third_party/protobuf/config.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/third_party/protobuf/config.h b/third_party/protobuf/config.h index 3d38f04..dcc0041 100644 --- a/third_party/protobuf/config.h +++ b/third_party/protobuf/config.h @@ -5,16 +5,28 @@ #define HASH_MAP_CLASS hash_map /* the location of <hash_map> */ +#if defined(USE_STLPORT) +#define HASH_MAP_H <hash_map> +#else #define HASH_MAP_H <ext/hash_map> +#endif /* the namespace of hash_map/hash_set */ +#if defined(USE_STLPORT) +#define HASH_NAMESPACE std +#else #define HASH_NAMESPACE __gnu_cxx +#endif /* the name of <hash_set> */ #define HASH_SET_CLASS hash_set /* the location of <hash_set> */ +#if defined(USE_STLPORT) +#define HASH_SET_H <hash_set> +#else #define HASH_SET_H <ext/hash_set> +#endif /* Define to 1 if you have the <dlfcn.h> header file. */ #define HAVE_DLFCN_H 1 |