diff options
| author |  Pirate Praveen <praveen@debian.org> | 2023-03-06 20:25:41 +0530 |
|---|---|---|
| committer | Pirate Praveen <praveen@debian.org> | 2023-03-06 20:25:41 +0530 |
| commit | 079dd8737bbaaaeeca3a95c2b858a62d8a620d5a (patch) | |
| tree | 6af54966e17bcfe48ecdb0b5cdf43cc953d5358c /absl/time/internal/cctz/src/zone_info_source.cc | |
| parent | 2bbc47f307f1e24f3f44a108d571bffa5a3faa63 (diff) | |
| parent | f5afcb784c9b1c501c1144b7aab84555881ca871 (diff) | |
Merge tag '20220623.1-1' into bullseye-backports-staging
Diffstat (limited to 'absl/time/internal/cctz/src/zone_info_source.cc')
| -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 \ |