diff options
| author | Sam Clegg <sbc@chromium.org> | 2018-05-03 01:34:26 -0700 |
|---|---|---|
| committer | Dominic Hamon <dominichamon@users.noreply.github.com> | 2018-05-03 09:34:26 +0100 |
| commit | 8986839e4ac67facb52abc7fff3d5082e854aab5 (patch) | |
| tree | 9ccad1daee88f23522dcb66b885689f7a8f06fe3 | |
| parent | ea5551e7b3129d8ee468b15e2a4242edd610ee02 (diff) | |
| download | google-benchmark-8986839e4ac67facb52abc7fff3d5082e854aab5.tar.gz | |
Use __EMSCRIPTEN__ (rather then EMSCRIPTEN) to check for emscripten (#583)
The old EMSCRIPTEN macro is deprecated and not enabled when
EMCC_STRICT is set.
Also fix a typo in EMSCRIPTN (not sure how this ever worked).
| -rw-r--r-- | include/benchmark/benchmark.h | 2 | ||||
| -rw-r--r-- | src/internal_macros.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/benchmark/benchmark.h b/include/benchmark/benchmark.h index 6be8c12..a6015b8 100644 --- a/include/benchmark/benchmark.h +++ b/include/benchmark/benchmark.h @@ -292,7 +292,7 @@ BENCHMARK_UNUSED static int stream_init_anchor = InitializeStreams(); #if (!defined(__GNUC__) && !defined(__clang__)) || defined(__pnacl__) || \ - defined(EMSCRIPTN) + defined(__EMSCRIPTEN__) # define BENCHMARK_HAS_NO_INLINE_ASSEMBLY #endif diff --git a/src/internal_macros.h b/src/internal_macros.h index f7b9203..edb8a5c 100644 --- a/src/internal_macros.h +++ b/src/internal_macros.h @@ -57,7 +57,7 @@ #define BENCHMARK_OS_LINUX 1 #elif defined(__native_client__) #define BENCHMARK_OS_NACL 1 -#elif defined(EMSCRIPTEN) +#elif defined(__EMSCRIPTEN__) #define BENCHMARK_OS_EMSCRIPTEN 1 #elif defined(__rtems__) #define BENCHMARK_OS_RTEMS 1 |