2005-07-30 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mono / dis / dump.c

diff --git a/mono/dis/dump.c b/mono/dis/dump.c
index 18551013ff0d77c65e4b6b8006859cff3bcc3149..2ebd0d4bd45ffca24c6dc9f6067bebfa61f7dfc0 100644 (file)
--- a/mono/dis/dump.c
+++ b/mono/dis/dump.c
@@ -17,11 +17,16 @@
 #include "get.h"
 #include "mono/metadata/loader.h"
 #include "mono/metadata/class.h"
+#include "mono/utils/mono-compiler.h"
+
+#ifndef HAVE_ISINF
 
 #ifdef HAVE_IEEEFP_H
 extern int isinf (double);
 #endif
 
+#endif
+
 void
 dump_table_assembly (MonoImage *m)
 {
@@ -815,11 +820,11 @@ handle_enum:
                        p += 4;
                        break;
                case MONO_TYPE_U8:
-                       g_string_sprintfa (res, "%lld", read64 (p));
+                       g_string_sprintfa (res, "%lld", (long long)read64 (p));
                        p += 8;
                        break;
                case MONO_TYPE_I8:
-                       g_string_sprintfa (res, "%lld", (gint64)read64 (p));
+                       g_string_sprintfa (res, "%lld", (long long)read64 (p));
                        p += 8;
                        break;
                case MONO_TYPE_R4: {