From: Rolf Bjarne Kvinge Date: Fri, 20 Nov 2015 13:19:16 +0000 (+0100) Subject: [runtime] Revert breaking changes in MonoGHashGCType. X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=384332ad5a740cc48d03426f878b74acacc301ba [runtime] Revert breaking changes in MonoGHashGCType. Xamarin.iOS and Xamarin.Mac uses this enum, and changing the values causes us to break. For Xamarin.Mac apps that do not bundle their mono, this would break when the user updated their system mono. --- diff --git a/mono/metadata/mono-hash.h b/mono/metadata/mono-hash.h index 4626ed48ca0..e07f8fadb83 100644 --- a/mono/metadata/mono-hash.h +++ b/mono/metadata/mono-hash.h @@ -13,11 +13,11 @@ #include MONO_BEGIN_DECLS - +/* do not change the values of this enum */ typedef enum { - MONO_HASH_KEY_GC, - MONO_HASH_VALUE_GC, - MONO_HASH_KEY_VALUE_GC + MONO_HASH_KEY_GC = 1, + MONO_HASH_VALUE_GC = 2, + MONO_HASH_KEY_VALUE_GC = MONO_HASH_KEY_GC | MONO_HASH_VALUE_GC, } MonoGHashGCType; typedef struct _MonoGHashTable MonoGHashTable;