From 5c2ee148ab63dc8b6a751cd6535a4e3d58f441ef Mon Sep 17 00:00:00 2001
From: monojenkins <jo.shields+jenkins@xamarin.com>
Date: Thu, 9 Apr 2020 23:41:55 -0400
Subject: [PATCH] [wasm][bcl][zoneinfo] Fix local zone info marshaling (#34762)

- 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 <kjpou1@users.noreply.github.com>
---
 src/mono/mono/metadata/icall-decl.h | 2 +-
 src/mono/mono/metadata/icall.c      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mono/mono/metadata/icall-decl.h b/src/mono/mono/metadata/icall-decl.h
index ee95b40..e018529 100644
--- a/src/mono/mono/metadata/icall-decl.h
+++ b/src/mono/mono/metadata/icall-decl.h
@@ -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)
diff --git a/src/mono/mono/metadata/icall.c b/src/mono/mono/metadata/icall.c
index b07fe63..a39cf2c 100644
--- a/src/mono/mono/metadata/icall.c
+++ b/src/mono/mono/metadata/icall.c
@@ -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
-- 
2.7.4