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

diff --git a/ikvm-native/ChangeLog b/ikvm-native/ChangeLog
index b5a9ad0087288cfb87dc270a2c9d3b5098056d92..db5bb23fad65af39000d84d8c58bded373ba6ed1 100644 (file)
--- 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 d634a4adc2ae99c21d79ca31972666fcf2b47572..64f93d7cff419ff401a715e1eca4773160ed8272 100644 (file)
--- 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