summaryrefslogtreecommitdiff
path: root/absl/time/internal/cctz
diff options
context:
space:
mode:
authorGravatar Abseil Team <absl-team@google.com>2020-05-27 11:44:41 -0700
committerGravatar Derek Mauro <dmauro@google.com>2020-05-27 15:18:40 -0400
commitaf8f994af5d25d9bebf542d6e6bf60edc40fd25d (patch)
treeb900c1d9c11081d4f4eecd28c4b78ebeedbbfbf3 /absl/time/internal/cctz
parent33caf1097ecce4fe892567462fa8821d477854b4 (diff)
Export of internal Abseil changes
-- db93e6ad497d3f08c57588e76aeb1effbfb732b8 by Derek Mauro <dmauro@google.com>: Import of CCTZ from GitHub. PiperOrigin-RevId: 313431846 GitOrigin-RevId: db93e6ad497d3f08c57588e76aeb1effbfb732b8 Change-Id: I3ccc60be109395e67e26ccdc710dab94bf5d06ef
Diffstat (limited to 'absl/time/internal/cctz')
-rw-r--r--absl/time/internal/cctz/src/zone_info_source.cc3
1 files changed, 2 insertions, 1 deletions
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 \