From: Rodrigo Kumpera <kumpera@users.noreply.github.com>
Date: Mon, 7 Nov 2016 16:04:29 +0000 (-0800)
Subject: Merge pull request #2408 from tastywheattasteslikechicken/MoreInterfaceSupport
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=4c960e1dd530396fdd9400c87729a6ce3101e5c1

Merge pull request #2408 from tastywheattasteslikechicken/MoreInterfaceSupport

Enhance maximum number of supported interfaces from 2^16.
---

4c960e1dd530396fdd9400c87729a6ce3101e5c1
diff --cc mono/metadata/class.c
index 6e1fb1d8bb9,60e320b6970..042c869adcc
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@@ -2824,9 -2779,9 +2824,9 @@@ mono_unload_interface_id (MonoClass *kl
   * Assign a unique integer ID to the interface represented by @class.
   * The ID will positive and as small as possible.
   * LOCKING: Acquires the classes lock.
 - * Returns: the new ID.
 + * Returns: The new ID.
   */
- static guint
+ static guint32
  mono_get_unique_iid (MonoClass *klass)
  {
  	int iid;
diff --cc mono/metadata/object.c
index 78fe2674122,db0047db648..c25a107fdeb
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@@ -2201,8 -2260,10 +2201,9 @@@ mono_class_proxy_vtable (MonoDomain *do
  {
  	MONO_REQ_GC_UNSAFE_MODE;
  
 -	MonoError error;
  	MonoVTable *vt, *pvt;
- 	int i, j, vtsize, max_interface_id, extra_interface_vtsize = 0;
+ 	int i, j, vtsize, extra_interface_vtsize = 0;
+ 	guint32 max_interface_id;
  	MonoClass *k;
  	GSList *extra_interfaces = NULL;
  	MonoClass *klass = remote_class->proxy_class;