From: Zoltan Varga <vargaz@gmail.com>
Date: Thu, 20 Jan 2005 12:52:01 +0000 (-0000)
Subject: 2005-01-20  Zoltan Varga  <vargaz@freemail.hu>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=6979f283209b4eb348a7109d2fe66af6ccb1d82d;p=mono.git

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 fd068dc14c0..ab8ad60ca7a 100644
--- 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 4fac309c8ed..7cbdee21951 100644
--- 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;