2005-01-20 Zoltan Varga <vargaz@freemail.hu>

	* jni.h: Applied patch from Bernie Solomon to fix compilation on
	non-gcc compilers.

svn path=/trunk/mono/; revision=39252

diff --git a/ikvm-native/ChangeLog b/ikvm-native/ChangeLog
index fd068dc14c06fbd6c529fa681a9aa3ca04b78c9c..ab8ad60ca7ad8c7f56a0ea64a76c4520fd9a4aee 100644 (file)
--- a/ikvm-native/ChangeLog
+++ b/ikvm-native/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-20  Zoltan Varga  <vargaz@freemail.hu>
+
+       * jni.h: Applied patch from Bernie Solomon to fix compilation on
+       non-gcc compilers.
+
 2005-01-13  Zoltan Varga  <vargaz@freemail.hu>
 
        * jni.c: Fix compilation on PPC.

diff --git a/ikvm-native/jni.h b/ikvm-native/jni.h
index 4fac309c8edcd756febb807c7bf72ce2bd0b24e5..7cbdee219512cafbcc34cf6306df105e39932782 100644 (file)
--- a/ikvm-native/jni.h
+++ b/ikvm-native/jni.h
@@ -64,10 +64,10 @@ typedef signed char jbyte;
 typedef unsigned short jchar;
 typedef short jshort;
 typedef int jint;
-#ifdef __GNUC__
-       typedef long long int jlong;
-#else
+#ifdef _MSC_VER
        typedef __int64 jlong;
+#else
+       typedef long long int jlong;
 #endif
 typedef float jfloat;
 typedef double jdouble;