diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-03 14:46:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-03 14:46:49 +0300 |
| commit | 5eb240a7fd5a1fee02a3851ccacca0925563258a (patch) | |
| tree | 61963dcfc3614135372b465e84c9fcefa5d53068 | |
| parent | 8b3b6666a858e02137b192c923727bcfd00ef620 (diff) | |
Allow nfloat to be in the ObjCRuntime namespace, and make it work for Xamarin.MacCatalyst.dll as well. (#21263)
Ref: https://github.com/xamarin/xamarin-macios/pull/13092
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
| -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 08f72acafe6..322f28f7e95 100644 --- a/mono/mini/mini-native-types.c +++ b/mono/mini/mini-native-types.c @@ -372,6 +372,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; @@ -427,7 +429,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) { |