Skip to content

Commit

Permalink
[wasm][bcl][zoneinfo] Fix local zone info marshaling (#34762)
Browse files Browse the repository at this point in the history
- Correctly marshal Intl.DateTimeFormat().resolvedOptions().timeZone information

/cc @pranavkm

Thanks for the report and testing Pranav

<!--
Thank you for your Pull Request!

If you are new to contributing to Mono, please try to do your best at conforming to our coding guidelines http://www.mono-project.com/community/contributing/coding-guidelines/ but don't worry if you get something wrong. One of the project members will help you to get things landed.

Does your pull request fix any of the existing issues? Please use the following format: Fixes #issue-number
-->

Co-authored-by: kjpou1 <[email protected]>
  • Loading branch information
monojenkins and kjpou1 authored Apr 10, 2020
1 parent ef54ab0 commit 5c2ee14
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/mono/mono/metadata/icall-decl.h
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ ICALL_EXPORT gint32 ves_icall_System_IO_Compression_DeflateStreamNative_WriteZSt
#endif

#if defined(TARGET_WASM)
ICALL_EXPORT void ves_icall_System_TimeZoneInfo_mono_timezone_get_local_name (MonoString result);
ICALL_EXPORT void ves_icall_System_TimeZoneInfo_mono_timezone_get_local_name (MonoString **result);
#endif

#if defined(ENABLE_MONODROID)
Expand Down
4 changes: 2 additions & 2 deletions src/mono/mono/metadata/icall.c
Original file line number Diff line number Diff line change
Expand Up @@ -8213,9 +8213,9 @@ ves_icall_System_IO_Compression_DeflateStreamNative_WriteZStream (gpointer strea
#endif

#if defined(TARGET_WASM)
G_EXTERN_C void mono_timezone_get_local_name (MonoString result);
G_EXTERN_C void mono_timezone_get_local_name (MonoString **result);
void
ves_icall_System_TimeZoneInfo_mono_timezone_get_local_name (MonoString result)
ves_icall_System_TimeZoneInfo_mono_timezone_get_local_name (MonoString **result)
{
// MONO_CROSS_COMPILE returns undefined symbol "_mono_timezone_get_local_name"
// The icall offsets will be generated and linked at build time
Expand Down

0 comments on commit 5c2ee14

Please sign in to comment.