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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/protobuf/config.h

Issue 8429034: Upstream: Build net_unittests for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix build Created 9 years, 1 month 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
« net/base/x509_certificate_openssl.cc ('K') | « net/spdy/spdy_protocol_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/config.h
diff --git a/third_party/protobuf/config.h b/third_party/protobuf/config.h
index 3d38f047cda6a2c4a9c76379ba2adf334ae4000b..dcc0041c2fe5847b509398f6e600b76c3e538555 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
« net/base/x509_certificate_openssl.cc ('K') | « net/spdy/spdy_protocol_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698