commit 1ca3efbe8e1fa4ea6829423183d42c312c212e4e
author The Android Open Source Project <initial-contribution@android.com> Fri Feb 05 14:26:32 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 05 14:26:32 2010 -0800
tree 10b3763f5134eb0d0a62c287b4945094912b410a
parent b927b7fc70e4e9260ae65a94051175b864d523e6
parent 2c6a1cc23c90090cefb61dd5f55e4859183b64b9

am 2c6a1cc2: am 1ef85481: reconcile main tree with open-source eclair

Merge commit '2c6a1cc23c90090cefb61dd5f55e4859183b64b9'

* commit '2c6a1cc23c90090cefb61dd5f55e4859183b64b9':
  android-2.1_r1 snapshot

include/gtest/internal/gtest-port.h

diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h
index 702ee63..c1a4bef 100644
--- a/include/gtest/internal/gtest-port.h
+++ b/include/gtest/internal/gtest-port.h
@@ -335,7 +335,7 @@
 // The user didn't tell us, so we need to figure it out.
 
 // GCC provides <tr1/tuple> since 4.0.0.
-#if defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000)
+#if defined(__GNUC__) && (GTEST_GCC_VER_ >= 40000) && !GTEST_OS_ANDROID
 #define GTEST_HAS_TR1_TUPLE 1
 #else
 #define GTEST_HAS_TR1_TUPLE 0