gtest-port-arch.h (googletest-release-1.10.0) | : | gtest-port-arch.h (googletest-release-1.11.0) | ||
---|---|---|---|---|
skipping to change at line 35 | skipping to change at line 35 | |||
// 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 GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_ | #ifndef GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_ | |||
#define GTEST_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 | |||
skipping to change at line 71 | skipping to change at line 71 | |||
// 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> | ||||
# 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(__GLIBC__) && defined(__FreeBSD_kernel__) | #elif defined(__GLIBC__) && defined(__FreeBSD_kernel__) | |||
skipping to change at line 105 | skipping to change at line 106 | |||
#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 | ||||
#define GTEST_OS_ESP8266 1 | ||||
#elif defined ESP32 | ||||
#define GTEST_OS_ESP32 1 | ||||
#elif defined(__XTENSA__) | ||||
#define GTEST_OS_XTENSA 1 | ||||
#endif // __CYGWIN__ | #endif // __CYGWIN__ | |||
#endif // GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_ | #endif // GOOGLETEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_ARCH_H_ | |||
End of changes. 4 change blocks. | ||||
2 lines changed or deleted | 9 lines changed or added |