diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-06-17T13·53+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-06-17T13·53+0100 |
| commit | 543379ce4572a4015c62812f93acb02938caece1 (patch) | |
| tree | 797b0cbcc4795bbc73d9d5b2913e06156fa8614a /third_party/abseil_cpp/absl/time/internal/cctz/src/zone_info_source.cc | |
| parent | c224a738e7524fd0b6c8bed134f43b307bdbc9e8 (diff) | |
| parent | 8f2828c4b4ce502d242eca80a80269448857f4a6 (diff) | |
merge(3p/abseil_cpp): Merge upstream at 'ccdbb5941' r/1011
Change-Id: I6e85fc7b5f76bba1f1eef15e600a8acb64e97ef5
Diffstat (limited to 'third_party/abseil_cpp/absl/time/internal/cctz/src/zone_info_source.cc')
| -rw-r--r-- | third_party/abseil_cpp/absl/time/internal/cctz/src/zone_info_source.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/abseil_cpp/absl/time/internal/cctz/src/zone_info_source.cc b/third_party/abseil_cpp/absl/time/internal/cctz/src/zone_info_source.cc index 98ea16126782..72095339c3c1 100644 --- a/third_party/abseil_cpp/absl/time/internal/cctz/src/zone_info_source.cc +++ b/third_party/abseil_cpp/absl/time/internal/cctz/src/zone_info_source.cc @@ -83,7 +83,8 @@ ZoneInfoSourceFactory default_factory = DefaultFactory; "@@U?$default_delete@VZoneInfoSource@cctz@time_internal@" ABSL_INTERNAL_MANGLED_NS \ "@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@" ABSL_INTERNAL_MANGLED_BACKREFERENCE \ "@@ZA") -#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM64) +#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM) || \ + defined(_M_ARM64) #pragma comment( \ linker, \ "/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \ |