diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2005-01-20 15:52:01 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2005-01-20 15:52:01 +0300 |
| commit | 6979f283209b4eb348a7109d2fe66af6ccb1d82d (patch) | |
| tree | f1f667fbb71581134de2573e6843292f61df2bd6 /ikvm-native | |
| parent | b4a4a19634fdcc23b3c3670e650488f9874a7861 (diff) | |
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
Diffstat (limited to 'ikvm-native')
| -rw-r--r-- | ikvm-native/ChangeLog | 5 | ||||
| -rw-r--r-- | ikvm-native/jni.h | 6 |
2 files changed, 8 insertions, 3 deletions
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; |