diff options
| author | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-07-08 21:32:17 (GMT) |
|---|---|---|
| committer | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-07-08 21:32:17 (GMT) |
| commit | e4e9a8bd7d2dbbad62030c8f80513e3c81b32213 (patch) | |
| tree | 08e242f8835e0688031e27305c5d58c24282f2e7 /include/gtest/gtest-message.h | |
| parent | d201456903f3ecae1f7794edfab0d5678e642265 (diff) | |
| download | googletest-e4e9a8bd7d2dbbad62030c8f80513e3c81b32213.zip googletest-e4e9a8bd7d2dbbad62030c8f80513e3c81b32213.tar.gz googletest-e4e9a8bd7d2dbbad62030c8f80513e3c81b32213.tar.bz2 | |
Makes the autotools scripts work on Mac OS X. Also hopefully makes gtest compile on Windows CE.
Diffstat (limited to 'include/gtest/gtest-message.h')
| -rw-r--r-- | include/gtest/gtest-message.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/gtest/gtest-message.h b/include/gtest/gtest-message.h index 746a168..b1d646f 100644 --- a/include/gtest/gtest-message.h +++ b/include/gtest/gtest-message.h @@ -46,20 +46,8 @@ #ifndef GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ #define GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_ -#if defined(__APPLE__) && !defined(GTEST_NOT_MAC_FRAMEWORK_MODE) -// When using Google Test on the Mac as a framework, all the includes will be -// in the framework headers folder along with gtest.h. -// Define GTEST_NOT_MAC_FRAMEWORK_MODE if you are building Google Test on -// the Mac and are not using it as a framework. -// More info on frameworks available here: -// http://developer.apple.com/documentation/MacOSX/Conceptual/BPFrameworks/ -// Concepts/WhatAreFrameworks.html. -#include "gtest-string.h" // NOLINT -#include "gtest-internal.h" // NOLINT -#else #include <gtest/internal/gtest-string.h> #include <gtest/internal/gtest-internal.h> -#endif // defined(__APPLE__) && !defined(GTEST_NOT_MAC_FRAMEWORK_MODE) namespace testing { |