X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mono%2Fmini%2Fcfgdump.c;h=1e76055f58110efa7587c6f49c3a061a987034fa;hb=3b2913ca03f284906f55606c9b36540890b7572a;hp=fb4f06fb9bed0356940ade628058ec623d250af1;hpb=9bf8d670fb9e8c223df4f4c11f4c935610b33320;p=mono.git

diff --git a/mono/mini/cfgdump.c b/mono/mini/cfgdump.c
index fb4f06fb9be..1e76055f581 100644
--- a/mono/mini/cfgdump.c
+++ b/mono/mini/cfgdump.c
@@ -21,7 +21,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <arpa/inet.h>
-#include <errno.h>
 
 #if 0
 #define CFG_DEBUG
@@ -438,15 +437,15 @@ constant_pool_hash (ConstantPoolEntry *entry)
 			return instruction_hash ((MonoInst *) entry->data);
 		case PT_SIGNATURE: {
 			MonoMethodSignature *sig = (MonoMethodSignature *) entry->data;
-			guint ret = (guint) sig->ret;
+			guint ret = GPOINTER_TO_UINT (sig->ret);
 			for (int i = 0; i < sig->param_count; i++) {
-				ret ^= (guint) sig->params [i] << (i + 1);
+				ret ^= GPOINTER_TO_UINT (sig->params [i]) << (i + 1);
 			}
 			return ret;
 		}
 		case PT_INPUTTYPE: // TODO: singleton.
 		case PT_ENUMKLASS:
-			return (guint) entry->data;
+			return GPOINTER_TO_UINT (entry->data);
 	}
 	g_assert (FALSE);
 	return FALSE;