aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/src
diff options
context:
space:
mode:
authorChris Johnson <chrisjohnsonmail@gmail.com>2019-08-28 09:39:35 -0500
committerChris Johnson <chrisjohnsonmail@gmail.com>2019-10-11 11:47:49 -0500
commit40a6b9662199890b20ccbac3b964ce04713d8ede (patch)
treed2123c108b6a6bbcf7d5f07dc792daab57c993fb /googlemock/src
parentba513d2c9525a7c986c115ed5d603f2cf17c6016 (diff)
downloadgoogletest-40a6b9662199890b20ccbac3b964ce04713d8ede.tar.gz
googletest-40a6b9662199890b20ccbac3b964ce04713d8ede.tar.bz2
googletest-40a6b9662199890b20ccbac3b964ce04713d8ede.zip
feat: Add support for ESP8266 platform
Added support for ESP8266 Arduino platform. Refactored Arduino defines to use the GTEST_OS_* model.
Diffstat (limited to 'googlemock/src')
-rw-r--r--googlemock/src/gmock_main.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/src/gmock_main.cc b/googlemock/src/gmock_main.cc
index 98611b93..4d4f48b7 100644
--- a/googlemock/src/gmock_main.cc
+++ b/googlemock/src/gmock_main.cc
@@ -32,7 +32,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#ifdef ARDUINO
+#if defined GTEST_OS_ESP8266 || defined GTEST_OS_ESP32
void setup() {
// Since Google Mock depends on Google Test, InitGoogleMock() is
// also responsible for initializing Google Test. Therefore there's