msvc.patch 2.6 KB

123456789101112131415161718192021222324
  1. From: Алексей Шакин <dieash@yandex-team.ru>
  2. Date: Mon, 2 Oct 2017 20:14:48 +0000
  3. Subject: [PATCH] tiny correction of Win/Darwin builds; REVIEW:335067
  4. git-svn-id: svn+ssh://arcadia.yandex.ru/arc/trunk/arcadia/contrib/libs/cctz@3183495 41d65440-b5be-11dd-afe3-b2e846d9b4f8
  5. --- a/src/zone_info_source.cc
  6. +++ b/src/zone_info_source.cc
  7. @@ -49 +49 @@ std::unique_ptr<cctz::ZoneInfoSource> DefaultFactory(
  8. -#if (__has_attribute(weak) || defined(__GNUC__)) && !defined(__MINGW32__)
  9. +#if (__has_attribute(weak) || defined(__GNUC__)) && !defined(__MINGW32__) && !defined(_MSC_VER)
  10. @@ -53 +53 @@ ZoneInfoSourceFactory zone_info_source_factory
  11. -#elif defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_LIBCPP_VERSION)
  12. +#elif defined(_MSC_VER) && !defined(__MINGW32__)
  13. @@ -78,9 +78,9 @@ ZoneInfoSourceFactory default_factory = DefaultFactory;
  14. #elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM) || \
  15. defined(_M_ARM64)
  16. #pragma comment( \
  17. linker, \
  18. - "/alternatename:?zone_info_source_factory@cctz_extension@@3P6A?AV?$unique_ptr@VZoneInfoSource@cctz@@U?$default_delete@VZoneInfoSource@cctz@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@AEBV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@@U?$default_delete@VZoneInfoSource@cctz@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@3@@ZEA=?default_factory@cctz_extension@@3P6A?AV?$unique_ptr@VZoneInfoSource@cctz@@U?$default_delete@VZoneInfoSource@cctz@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@3@AEBV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@@U?$default_delete@VZoneInfoSource@cctz@@@std@@@std@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@3@@ZEA")
  19. + "/alternatename:?zone_info_source_factory@cctz_extension@@3P6A?AV?$unique_ptr@VZoneInfoSource@cctz@@U?$default_delete@VZoneInfoSource@cctz@@@__y1@std@@@__y1@std@@AEBV?$basic_string@DU?$char_traits@D@__y1@std@@V?$allocator@D@23@@34@AEBV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@@U?$default_delete@VZoneInfoSource@cctz@@@__y1@std@@@__y1@std@@AEBV?$basic_string@DU?$char_traits@D@__y1@std@@V?$allocator@D@23@@23@@Z@34@@ZEA=?default_factory@cctz_extension@@3P6A?AV?$unique_ptr@VZoneInfoSource@cctz@@U?$default_delete@VZoneInfoSource@cctz@@@__y1@std@@@__y1@std@@AEBV?$basic_string@DU?$char_traits@D@__y1@std@@V?$allocator@D@23@@34@AEBV?$function@$$A6A?AV?$unique_ptr@VZoneInfoSource@cctz@@U?$default_delete@VZoneInfoSource@cctz@@@__y1@std@@@__y1@std@@AEBV?$basic_string@DU?$char_traits@D@__y1@std@@V?$allocator@D@23@@23@@Z@34@@ZEA")
  20. #else
  21. #error Unsupported MSVC platform
  22. #endif // _M_<PLATFORM>
  23. #else