diff options
| author | Rolf Bjarne Kvinge <rolf@xamarin.com> | 2021-11-03 14:46:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-03 14:46:32 +0300 |
| commit | dfcef746405b049e0ac8e438f6f3c1a1068cd6ab (patch) | |
| tree | 0390f9bd2e0cdf8cb66841736a420a5ad538c6bc | |
| parent | 5ce143a1a88fe9d9be1f1c305d81ae3f7bee2ced (diff) | |
Allow nfloat to be in the ObjCRuntime namespace, and make it work for Xamarin.MacCatalyst.dll as well. (#21261)
Ref: https://github.com/xamarin/xamarin-macios/pull/13092
| -rw-r--r-- | mono/mini/mini-native-types.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mono/mini/mini-native-types.c b/mono/mini/mini-native-types.c index 7d4bf660966..a6077e6e2f7 100644 --- a/mono/mini/mini-native-types.c +++ b/mono/mini/mini-native-types.c @@ -379,6 +379,8 @@ mono_class_is_magic_assembly (MonoClass *klass) return TRUE; if (!strcmp ("Xamarin.WatchOS", aname)) return TRUE; + if (!strcmp ("Xamarin.MacCatalyst", aname)) + return TRUE; /* regression test suite */ if (!strcmp ("builtin-types", aname)) return TRUE; @@ -434,7 +436,7 @@ mono_class_is_magic_float (MonoClass *klass) if (!mono_class_is_magic_assembly (klass)) return FALSE; - if (strcmp ("System", m_class_get_name_space (klass)) != 0) + if (strcmp ("System", m_class_get_name_space (klass)) != 0 && strcmp ("ObjCRuntime", m_class_get_name_space (klass)) != 0) return FALSE; if (strcmp ("nfloat", m_class_get_name (klass)) == 0) { |