gtest-port-arch.h (googletest-release-1.11.0) | : | gtest-port-arch.h (googletest-release-1.12.0) | ||
---|---|---|---|---|
skipping to change at line 29 | skipping to change at line 29 | |||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | |||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | |||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | |||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | |||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
// | ||||
// The Google C++ Testing and Mocking Framework (Google Test) | // The Google C++ Testing and Mocking Framework (Google Test) | |||
// | // | |||
// This header file defines the GTEST_OS_* macro. | // This header file defines the GTEST_OS_* macro. | |||
// It is separate from gtest-port.h so that custom/gtest-port.h can include it. | // It is separate from gtest-port.h so that custom/gtest-port.h can include it. | |||
#ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_ | #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_ | |||
#define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_ | #define GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_ | |||
// Determines the platform on which Google Test is compiled. | // Determines the platform on which Google Test is compiled. | |||
#ifdef __CYGWIN__ | #ifdef __CYGWIN__ | |||
# define GTEST_OS_CYGWIN 1 | #define GTEST_OS_CYGWIN 1 | |||
# elif defined(__MINGW__) || defined(__MINGW32__) || defined(__MINGW64__) | #elif defined(__MINGW__) || defined(__MINGW32__) || defined(__MINGW64__) | |||
# define GTEST_OS_WINDOWS_MINGW 1 | #define GTEST_OS_WINDOWS_MINGW 1 | |||
# define GTEST_OS_WINDOWS 1 | #define GTEST_OS_WINDOWS 1 | |||
#elif defined _WIN32 | #elif defined _WIN32 | |||
# define GTEST_OS_WINDOWS 1 | #define GTEST_OS_WINDOWS 1 | |||
# ifdef _WIN32_WCE | #ifdef _WIN32_WCE | |||
# define GTEST_OS_WINDOWS_MOBILE 1 | #define GTEST_OS_WINDOWS_MOBILE 1 | |||
# elif defined(WINAPI_FAMILY) | #elif defined(WINAPI_FAMILY) | |||
# include <winapifamily.h> | #include <winapifamily.h> | |||
# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | |||
# define GTEST_OS_WINDOWS_DESKTOP 1 | #define GTEST_OS_WINDOWS_DESKTOP 1 | |||
# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) | #elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) | |||
# define GTEST_OS_WINDOWS_PHONE 1 | #define GTEST_OS_WINDOWS_PHONE 1 | |||
# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) | #elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) | |||
# define GTEST_OS_WINDOWS_RT 1 | #define GTEST_OS_WINDOWS_RT 1 | |||
# elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE) | #elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_TV_TITLE) | |||
# define GTEST_OS_WINDOWS_PHONE 1 | #define GTEST_OS_WINDOWS_PHONE 1 | |||
# define GTEST_OS_WINDOWS_TV_TITLE 1 | #define GTEST_OS_WINDOWS_TV_TITLE 1 | |||
# else | #else | |||
// WINAPI_FAMILY defined but no known partition matched. | // WINAPI_FAMILY defined but no known partition matched. | |||
// Default to desktop. | // Default to desktop. | |||
# define GTEST_OS_WINDOWS_DESKTOP 1 | #define GTEST_OS_WINDOWS_DESKTOP 1 | |||
# endif | #endif | |||
# else | #else | |||
# define GTEST_OS_WINDOWS_DESKTOP 1 | #define GTEST_OS_WINDOWS_DESKTOP 1 | |||
# endif // _WIN32_WCE | #endif // _WIN32_WCE | |||
#elif defined __OS2__ | #elif defined __OS2__ | |||
# define GTEST_OS_OS2 1 | #define GTEST_OS_OS2 1 | |||
#elif defined __APPLE__ | #elif defined __APPLE__ | |||
# define GTEST_OS_MAC 1 | #define GTEST_OS_MAC 1 | |||
# include <TargetConditionals.h> | #include <TargetConditionals.h> | |||
# if TARGET_OS_IPHONE | #if TARGET_OS_IPHONE | |||
# define GTEST_OS_IOS 1 | #define GTEST_OS_IOS 1 | |||
# endif | #endif | |||
#elif defined __DragonFly__ | #elif defined __DragonFly__ | |||
# define GTEST_OS_DRAGONFLY 1 | #define GTEST_OS_DRAGONFLY 1 | |||
#elif defined __FreeBSD__ | #elif defined __FreeBSD__ | |||
# define GTEST_OS_FREEBSD 1 | #define GTEST_OS_FREEBSD 1 | |||
#elif defined __Fuchsia__ | #elif defined __Fuchsia__ | |||
# define GTEST_OS_FUCHSIA 1 | #define GTEST_OS_FUCHSIA 1 | |||
#elif defined(__GNU__) | ||||
#define GTEST_OS_GNU_HURD 1 | ||||
#elif defined(__GLIBC__) && defined(__FreeBSD_kernel__) | #elif defined(__GLIBC__) && defined(__FreeBSD_kernel__) | |||
# define GTEST_OS_GNU_KFREEBSD 1 | #define GTEST_OS_GNU_KFREEBSD 1 | |||
#elif defined __linux__ | #elif defined __linux__ | |||
# define GTEST_OS_LINUX 1 | #define GTEST_OS_LINUX 1 | |||
# if defined __ANDROID__ | #if defined __ANDROID__ | |||
# define GTEST_OS_LINUX_ANDROID 1 | #define GTEST_OS_LINUX_ANDROID 1 | |||
# endif | #endif | |||
#elif defined __MVS__ | #elif defined __MVS__ | |||
# define GTEST_OS_ZOS 1 | #define GTEST_OS_ZOS 1 | |||
#elif defined(__sun) && defined(__SVR4) | #elif defined(__sun) && defined(__SVR4) | |||
# define GTEST_OS_SOLARIS 1 | #define GTEST_OS_SOLARIS 1 | |||
#elif defined(_AIX) | #elif defined(_AIX) | |||
# define GTEST_OS_AIX 1 | #define GTEST_OS_AIX 1 | |||
#elif defined(__hpux) | #elif defined(__hpux) | |||
# define GTEST_OS_HPUX 1 | #define GTEST_OS_HPUX 1 | |||
#elif defined __native_client__ | #elif defined __native_client__ | |||
# define GTEST_OS_NACL 1 | #define GTEST_OS_NACL 1 | |||
#elif defined __NetBSD__ | #elif defined __NetBSD__ | |||
# define GTEST_OS_NETBSD 1 | #define GTEST_OS_NETBSD 1 | |||
#elif defined __OpenBSD__ | #elif defined __OpenBSD__ | |||
# define GTEST_OS_OPENBSD 1 | #define GTEST_OS_OPENBSD 1 | |||
#elif defined __QNX__ | #elif defined __QNX__ | |||
# define GTEST_OS_QNX 1 | #define GTEST_OS_QNX 1 | |||
#elif defined(__HAIKU__) | #elif defined(__HAIKU__) | |||
#define GTEST_OS_HAIKU 1 | #define GTEST_OS_HAIKU 1 | |||
#elif defined ESP8266 | #elif defined ESP8266 | |||
#define GTEST_OS_ESP8266 1 | #define GTEST_OS_ESP8266 1 | |||
#elif defined ESP32 | #elif defined ESP32 | |||
#define GTEST_OS_ESP32 1 | #define GTEST_OS_ESP32 1 | |||
#elif defined(__XTENSA__) | #elif defined(__XTENSA__) | |||
#define GTEST_OS_XTENSA 1 | #define GTEST_OS_XTENSA 1 | |||
#endif // __CYGWIN__ | #endif // __CYGWIN__ | |||
End of changes. 18 change blocks. | ||||
49 lines changed or deleted | 51 lines changed or added |