Skip to content

Commit

Permalink
Allow nfloat to be in the ObjCRuntime namespace, and make it work for…
Browse files Browse the repository at this point in the history
… Xamarin.MacCatalyst.dll as well.

Ref: xamarin/xamarin-macios#13092
Ref: mono/mono#21261
  • Loading branch information
rolfbjarne authored and github-actions committed Oct 26, 2021
1 parent 4822e3c commit e38aa3b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/mono/mono/mini/mini-native-types.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit e38aa3b

Please sign in to comment.