gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use "#ifdef GTEST_OS_..." instead of "#if GTEST_OS_..."

Browse Source 
This is compatible with compiling with "-Wundef" (#3267).

PiperOrigin-RevId: 513943378
Change-Id: I47cf5fabbb77be061c4483a0adc54511af6b191c
This commit is contained in:
Tom Hughes
2023-03-03 15:54:32 -08:00
committed by Copybara-Service
parent cead3d57c9
commit 23142843f7
27 changed files with 305 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
googlemock/src/gmock_main.cc
View File

@@ -32,8 +32,8 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#if GTEST_OS_ESP8266 || GTEST_OS_ESP32
#if GTEST_OS_ESP8266
#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32)
#ifdef GTEST_OS_ESP8266
extern "C" {
#endif
void setup() {
@@ -43,7 +43,7 @@ void setup() {
testing::InitGoogleMock();
}
void loop() { RUN_ALL_TESTS(); }
#if GTEST_OS_ESP8266
#ifdef GTEST_OS_ESP8266
}
#endif
@@ -55,7 +55,7 @@ void loop() { RUN_ALL_TESTS(); }
// Windows. See the following link to track the current status of this bug:
// https://web.archive.org/web/20170912203238/connect.microsoft.com/VisualStudio/feedback/details/394464/wmain-link-error-in-the-static-library
// // NOLINT
#if GTEST_OS_WINDOWS_MOBILE
#ifdef GTEST_OS_WINDOWS_MOBILE
#include <tchar.h> // NOLINT
GTEST_API_ int _tmain(int argc, TCHAR** argv) {