projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2542 from akoeplinger/remove-changelog
[mono.git]
/
ikvm-native
/
jni.c
diff --git
a/ikvm-native/jni.c
b/ikvm-native/jni.c
index 3ff3790e8ca5d240e80cc916f0a7c1480d9f6474..e638db1d76f341e2e7df7157292feb57ba00466b 100644
(file)
--- a/
ikvm-native/jni.c
+++ b/
ikvm-native/jni.c
@@
-28,7
+28,7
@@
#include <malloc.h>
#define ALLOCA _alloca
#else
#include <malloc.h>
#define ALLOCA _alloca
#else
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__)
|| defined(__OpenBSD__)
#include <stdlib.h>
#else
#include <alloca.h>
#include <stdlib.h>
#else
#include <alloca.h>
@@
-486,11
+486,15
@@
static void* JNIEnv_vtable[] =
0 // jlong JNICALL GetDirectBufferCapacity(jobject buf);
};
0 // jlong JNICALL GetDirectBufferCapacity(jobject buf);
};
-JNIEXPORT void** JNICALL ikvm_GetJNIEnvVTable()
+void** ikvm_GetJNIEnvVTable(void);
+
+JNIEXPORT void** JNICALL ikvm_GetJNIEnvVTable(void)
{
return JNIEnv_vtable;
}
{
return JNIEnv_vtable;
}
+void* JNICALL ikvm_MarshalDelegate(void* p);
+
JNIEXPORT void* JNICALL ikvm_MarshalDelegate(void* p)
{
return p;
JNIEXPORT void* JNICALL ikvm_MarshalDelegate(void* p)
{
return p;
@@
-498,6
+502,8
@@
JNIEXPORT void* JNICALL ikvm_MarshalDelegate(void* p)
typedef jint (JNICALL *PJNI_ONLOAD)(JavaVM* vm, void* reserved);
typedef jint (JNICALL *PJNI_ONLOAD)(JavaVM* vm, void* reserved);
+jint JNICALL ikvm_CallOnLoad(PJNI_ONLOAD method, JavaVM* vm, void* reserved);
+
JNIEXPORT jint JNICALL ikvm_CallOnLoad(PJNI_ONLOAD method, JavaVM* vm, void* reserved)
{
return method(vm, reserved);
JNIEXPORT jint JNICALL ikvm_CallOnLoad(PJNI_ONLOAD method, JavaVM* vm, void* reserved)
{
return method(vm, reserved);