diff options
| author | Copybara-Service <copybara-worker@google.com> | 2023-07-18 08:16:57 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-07-18 08:16:57 -0700 |
| commit | c541e7c11044b1e0303103ef8a47d7a9632c479b (patch) | |
| tree | e5d8b04eb9a4ce220b9d62589bc666d95ff2591b /googlemock | |
| parent | cc366710bbf40a9816d47c35802d06dbaccb8792 (diff) | |
| parent | 091d7eb897d5671449efb348834e5c78d36f6459 (diff) | |
| download | googletest-c541e7c11044b1e0303103ef8a47d7a9632c479b.zip googletest-c541e7c11044b1e0303103ef8a47d7a9632c479b.tar.gz googletest-c541e7c11044b1e0303103ef8a47d7a9632c479b.tar.bz2 | |
Merge pull request #4302 from ciband:feat/nrf52
PiperOrigin-RevId: 549006105
Change-Id: Ifbe2bf57e10df4c71e51dbfaf1687f4f621f5106
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/src/gmock_main.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/src/gmock_main.cc b/googlemock/src/gmock_main.cc index fb37b53..6b55412 100644 --- a/googlemock/src/gmock_main.cc +++ b/googlemock/src/gmock_main.cc @@ -32,7 +32,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32) +#if defined(GTEST_OS_ESP8266) || defined(GTEST_OS_ESP32) || \ + (defined(GTEST_OS_NRF52) && defined(ARDUINO)) #ifdef GTEST_OS_ESP8266 extern "C" { #endif |