Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ikvm-native/ChangeLog4
-rw-r--r--ikvm-native/jni.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/ikvm-native/ChangeLog b/ikvm-native/ChangeLog
index 4631eaedaf1..715f44bd81a 100644
--- a/ikvm-native/ChangeLog
+++ b/ikvm-native/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-11 Zoltan Varga <vargaz@gmail.com>
+
+ * jni.c: Apply a patch from the freebsd ports tree. Include the proper
+ include for alloca ().
Tue Aug 22 17:16:53 CEST 2006 Paolo Molaro <lupus@ximian.com>
diff --git a/ikvm-native/jni.c b/ikvm-native/jni.c
index 64f93d7cff4..3ff3790e8ca 100644
--- a/ikvm-native/jni.c
+++ b/ikvm-native/jni.c
@@ -28,7 +28,9 @@
#include <malloc.h>
#define ALLOCA _alloca
#else
-#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <stdlib.h>
+#else
#include <alloca.h>
#endif
#define ALLOCA alloca