diff options
| author |  Abseil Team <absl-team@google.com> | 2018-03-20 21:10:15 -0700 |
|---|---|---|
| committer |  katzdm <katzdm@google.com> | 2018-03-21 10:51:50 -0400 |
| commit | 4e2e6c5c0071e6430056a8ef0a6c8a1fe584d8ff (patch) | |
| tree | 37fb874b61a1ef7dac7cc6efa36de0b2cc2f40d7 /absl/base | |
| parent | 506fb4b56a339314fde23802bd749dbc3b3c1c79 (diff) | |
Changes imported from Abseil "staging" branch:
- 1320147f7597a9490562d439ecea46faa1793a24 Support Hex formatting of pointers without forcing a cast... by Jorg Brown <jorg@google.com>
- 13c793d6e14a52063c2d4ee327b6c976631b690e Add support for native WebAssembly llvm backend. by Abseil Team <absl-team@google.com>
GitOrigin-RevId: 1320147f7597a9490562d439ecea46faa1793a24
Change-Id: Ibd4dbf288903ab45387932e5b11a28f5accdf166
Diffstat (limited to 'absl/base')
| -rw-r--r-- | absl/base/config.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/absl/base/config.h b/absl/base/config.h index a387041d..87e403ad 100644 --- a/absl/base/config.h +++ b/absl/base/config.h @@ -250,6 +250,7 @@ // Windows _WIN32 // NaCL __native_client__ // AsmJS __asmjs__ +// WebAssembly __wasm__ // Fuchsia __Fuchsia__ // // Note that since Android defines both __ANDROID__ and __linux__, one @@ -263,7 +264,7 @@ #error ABSL_HAVE_MMAP cannot be directly set #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ defined(__ros__) || defined(__native_client__) || defined(__asmjs__) || \ - defined(__Fuchsia__) + defined(__wasm__) || defined(__Fuchsia__) #define ABSL_HAVE_MMAP 1 #endif |