diff options
| author |  Abseil Team <absl-team@google.com> | 2021-11-02 06:58:37 -0700 |
|---|---|---|
| committer |  Derek Mauro <dmauro@google.com> | 2021-11-02 10:05:29 -0400 |
| commit | 3b22e57740b8aec4920c4cfd76b78b3a4fcb2bb5 (patch) | |
| tree | 2334613ad2653701233bbbe361b22a948ffd1202 /absl | |
| parent | b6b62c72b4209f953923354bfb1eb40ed867b5c3 (diff) | |
Export of internal Abseil changes
--
9ab15354ad0462f51e078b87d73a68f789644b24 by Derek Mauro <dmauro@google.com>:
Import of CCTZ from GitHub.
PiperOrigin-RevId: 407072980
GitOrigin-RevId: 9ab15354ad0462f51e078b87d73a68f789644b24
Change-Id: Ibed92d989dd877efa11073ee981033d7598d0295
Diffstat (limited to 'absl')
| -rw-r--r-- | absl/time/internal/cctz/src/zone_info_source.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/absl/time/internal/cctz/src/zone_info_source.cc b/absl/time/internal/cctz/src/zone_info_source.cc index 72095339..5ab5a59e 100644 --- a/absl/time/internal/cctz/src/zone_info_source.cc +++ b/absl/time/internal/cctz/src/zone_info_source.cc @@ -65,7 +65,7 @@ ZoneInfoSourceFactory zone_info_source_factory __attribute__((weak)) = extern ZoneInfoSourceFactory zone_info_source_factory; extern ZoneInfoSourceFactory default_factory; ZoneInfoSourceFactory default_factory = DefaultFactory; -#if defined(_M_IX86) +#if defined(_M_IX86) || defined(_M_ARM) #pragma comment( \ linker, \ "/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \ @@ -83,8 +83,7 @@ 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_ARM) || \ - defined(_M_ARM64) +#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM64) #pragma comment( \ linker, \ "/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \ |