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:
authorZoltan Varga <vargaz@gmail.com>2005-01-13 23:25:00 +0300
committerZoltan Varga <vargaz@gmail.com>2005-01-13 23:25:00 +0300
commit324dae4ee6f35620d8460b2e1bb38f2b0ebc8824 (patch)
tree14b2c71453a2f730ac420b844a53c9bc700d5690 /ikvm-native
parent17e1f9dca25758fb98e5806c036a2aac6ae34eb7 (diff)
2005-01-13 Zoltan Varga <vargaz@freemail.hu>
* jni.c: Fix compilation on PPC. svn path=/trunk/mono/; revision=38892
Diffstat (limited to 'ikvm-native')
-rw-r--r--ikvm-native/ChangeLog2
-rw-r--r--ikvm-native/jni.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ikvm-native/ChangeLog b/ikvm-native/ChangeLog
index b50d4e94b0d..fd068dc14c0 100644
--- a/ikvm-native/ChangeLog
+++ b/ikvm-native/ChangeLog
@@ -1,5 +1,7 @@
2005-01-13 Zoltan Varga <vargaz@freemail.hu>
+ * jni.c: Fix compilation on PPC.
+
* Makefile.am os.c jni.h jni.c: New files. This is a copy of the
'native' module in IKVM CVS, placed here so IKVM users don't need to
copy/install the native library.
diff --git a/ikvm-native/jni.c b/ikvm-native/jni.c
index 33c78bec2a0..4690feda42c 100644
--- a/ikvm-native/jni.c
+++ b/ikvm-native/jni.c
@@ -22,10 +22,10 @@
*/
#include <stdarg.h>
-#include <malloc.h>
#include "jni.h"
#ifdef _WIN32
+#include <malloc.h>
#define ALLOCA _alloca
#else
#include <alloca.h>