summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2012-11-18 14:51:59 -0800
committerSteve Kondik <shade@chemlab.org>2012-11-18 14:51:59 -0800
commit4ec08dd85e9e4584f1bb0cd6110590f367d8b258 (patch)
treed76c7a2dc7d79fc7d52a93a907fd56c830d3cf84 /net/http
parent5fbe95affc8eeed93c678b1d271f64dcc4dd919b (diff)
parentdb1b8993439cc1b0f741735e15d72a8cd67a6752 (diff)
downloadexternal_chromium-4ec08dd85e9e4584f1bb0cd6110590f367d8b258.zip
external_chromium-4ec08dd85e9e4584f1bb0cd6110590f367d8b258.tar.gz
external_chromium-4ec08dd85e9e4584f1bb0cd6110590f367d8b258.tar.bz2
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/chromium into mr1-staging
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_auth_handler_ntlm_portable.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/http/http_auth_handler_ntlm_portable.cc b/net/http/http_auth_handler_ntlm_portable.cc
index fac37c8..5fa078d 100644
--- a/net/http/http_auth_handler_ntlm_portable.cc
+++ b/net/http/http_auth_handler_ntlm_portable.cc
@@ -70,9 +70,13 @@ namespace net {
* ***** END LICENSE BLOCK ***** */
// Discover the endianness by testing processor architecture.
-#if defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARMEL)
+#if defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64)\
+ || defined(ARCH_CPU_ARMEL) || defined(ARCH_CPU_MIPSEL)
#define IS_LITTLE_ENDIAN 1
#undef IS_BIG_ENDIAN
+#elif defined(ARCH_CPU_MIPSEB)
+#undef IS_LITTLE_ENDIAN
+#define IS_BIG_ENDIAN 1
#else
#error "Unknown endianness"
#endif