Skip to content

Commit 3b22e57

Browse files
Abseil Teamderekmauro
authored andcommitted
Export of internal Abseil changes
-- 9ab15354ad0462f51e078b87d73a68f789644b24 by Derek Mauro <[email protected]>: Import of CCTZ from GitHub. PiperOrigin-RevId: 407072980 GitOrigin-RevId: 9ab15354ad0462f51e078b87d73a68f789644b24 Change-Id: Ibed92d989dd877efa11073ee981033d7598d0295
1 parent b6b62c7 commit 3b22e57

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

absl/time/internal/cctz/src/zone_info_source.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ ZoneInfoSourceFactory zone_info_source_factory __attribute__((weak)) =
6565
extern ZoneInfoSourceFactory zone_info_source_factory;
6666
extern ZoneInfoSourceFactory default_factory;
6767
ZoneInfoSourceFactory default_factory = DefaultFactory;
68-
#if defined(_M_IX86)
68+
#if defined(_M_IX86) || defined(_M_ARM)
6969
#pragma comment( \
7070
linker, \
7171
"/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \
@@ -83,8 +83,7 @@ ZoneInfoSourceFactory default_factory = DefaultFactory;
8383
"@@U?$default_delete@VZoneInfoSource@cctz@time_internal@" ABSL_INTERNAL_MANGLED_NS \
8484
"@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@" ABSL_INTERNAL_MANGLED_BACKREFERENCE \
8585
"@@ZA")
86-
#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM) || \
87-
defined(_M_ARM64)
86+
#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM64)
8887
#pragma comment( \
8988
linker, \
9089
"/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \

0 commit comments

Comments
 (0)