From af8f994af5d25d9bebf542d6e6bf60edc40fd25d Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 27 May 2020 11:44:41 -0700 Subject: [PATCH] Export of internal Abseil changes -- db93e6ad497d3f08c57588e76aeb1effbfb732b8 by Derek Mauro : Import of CCTZ from GitHub. PiperOrigin-RevId: 313431846 GitOrigin-RevId: db93e6ad497d3f08c57588e76aeb1effbfb732b8 Change-Id: I3ccc60be109395e67e26ccdc710dab94bf5d06ef --- absl/time/internal/cctz/src/zone_info_source.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/absl/time/internal/cctz/src/zone_info_source.cc b/absl/time/internal/cctz/src/zone_info_source.cc index 98ea1612..72095339 100644 --- a/absl/time/internal/cctz/src/zone_info_source.cc +++ b/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 \