X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=ikvm-native%2Fjni.c;h=e638db1d76f341e2e7df7157292feb57ba00466b;hb=7c6607a000b6239e86d1736a1815264af55c13e2;hp=4690feda42c58986ebc55af784d40df954e4c67e;hpb=324dae4ee6f35620d8460b2e1bb38f2b0ebc8824;p=mono.git diff --git a/ikvm-native/jni.c b/ikvm-native/jni.c index 4690feda42c..e638db1d76f 100644 --- a/ikvm-native/jni.c +++ b/ikvm-native/jni.c @@ -28,7 +28,11 @@ #include #define ALLOCA _alloca #else +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +#include +#else #include +#endif #define ALLOCA alloca #endif @@ -482,11 +486,15 @@ static void* JNIEnv_vtable[] = 0 // jlong JNICALL GetDirectBufferCapacity(jobject buf); }; -JNIEXPORT void** JNICALL ikvm_GetJNIEnvVTable() +void** ikvm_GetJNIEnvVTable(void); + +JNIEXPORT void** JNICALL ikvm_GetJNIEnvVTable(void) { return JNIEnv_vtable; } +void* JNICALL ikvm_MarshalDelegate(void* p); + JNIEXPORT void* JNICALL ikvm_MarshalDelegate(void* p) { return p; @@ -494,6 +502,8 @@ JNIEXPORT void* JNICALL ikvm_MarshalDelegate(void* p) 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);