diff options
author | Zoltan Varga <vargaz@gmail.com> | 2005-04-11 18:14:47 +0400 |
---|---|---|
committer | Zoltan Varga <vargaz@gmail.com> | 2005-04-11 18:14:47 +0400 |
commit | ba60324d22cfcddf797a91b7a74619255ded92c2 (patch) | |
tree | 94aa9438e80aa6eed26c086f09db13a76d750d97 | |
parent | 8f59820b6bf3a2835bf4d34a18bdd76de0180083 (diff) |
2005-04-11 Zoltan Varga <vargaz@freemail.hu>
* jni.c: Applied some freebsd patches from Bill Middleton <flashdict@gmail.com>.
svn path=/trunk/mono/; revision=42788
-rw-r--r-- | ikvm-native/ChangeLog | 4 | ||||
-rw-r--r-- | ikvm-native/jni.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ikvm-native/ChangeLog b/ikvm-native/ChangeLog index b5a9ad00872..db5bb23fad6 100644 --- a/ikvm-native/ChangeLog +++ b/ikvm-native/ChangeLog @@ -1,3 +1,7 @@ +2005-04-11 Zoltan Varga <vargaz@freemail.hu> + + * jni.c: Applied some freebsd patches from Bill Middleton <flashdict@gmail.com>. + 2005-04-05 Zoltan Varga <vargaz@freemail.hu> * jni.c: Apply patch from freebsd ports tree. diff --git a/ikvm-native/jni.c b/ikvm-native/jni.c index d634a4adc2a..64f93d7cff4 100644 --- a/ikvm-native/jni.c +++ b/ikvm-native/jni.c @@ -28,9 +28,9 @@ #include <malloc.h> #define ALLOCA _alloca #else +#if !defined(__FreeBSD__) && !defined(__NetBSD__) #include <alloca.h> -/* alloca is in stdlib.h on freebsd */ -#include <stdlib.h> +#endif #define ALLOCA alloca #endif |