merged volatile memory barriers

[cacao.git] / src / native / jni.cpp

diff --git a/src/native/jni.cpp b/src/native/jni.cpp
index f6eb7082a502a5a70239897fd48a54549b198e89..6e850fd2bac0db539175b06ad3fe7c06ea6b6b8a 100644 (file)
--- a/src/native/jni.cpp
+++ b/src/native/jni.cpp
@@ -2890,7 +2890,7 @@ void _Jv_JNI_Release##name##ArrayElements(JNIEnv *env, type##Array array,  \
 }
 
 JNI_RELEASE_ARRAY_ELEMENTS(Boolean, jboolean, boolean, u1)
-JNI_RELEASE_ARRAY_ELEMENTS(Byte,    jbyte,    byte,    int8_t)
+JNI_RELEASE_ARRAY_ELEMENTS(Byte,    jbyte,    byte,    s1)
 JNI_RELEASE_ARRAY_ELEMENTS(Char,    jchar,    char,    u2)
 JNI_RELEASE_ARRAY_ELEMENTS(Short,   jshort,   short,   s2)
 JNI_RELEASE_ARRAY_ELEMENTS(Int,     jint,     int,     s4)
@@ -2921,7 +2921,7 @@ void _Jv_JNI_Get##name##ArrayRegion(JNIEnv *env, type##Array array,     \
 }
 
 JNI_GET_ARRAY_REGION(Boolean, jboolean, boolean, u1)
-JNI_GET_ARRAY_REGION(Byte,    jbyte,    byte,    int8_t)
+JNI_GET_ARRAY_REGION(Byte,    jbyte,    byte,    s1)
 JNI_GET_ARRAY_REGION(Char,    jchar,    char,    u2)
 JNI_GET_ARRAY_REGION(Short,   jshort,   short,   s2)
 JNI_GET_ARRAY_REGION(Int,     jint,     int,     s4)
@@ -2952,7 +2952,7 @@ void _Jv_JNI_Set##name##ArrayRegion(JNIEnv *env, type##Array array,          \
 }
 
 JNI_SET_ARRAY_REGION(Boolean, jboolean, boolean, u1)
-JNI_SET_ARRAY_REGION(Byte,    jbyte,    byte,    int8_t)
+JNI_SET_ARRAY_REGION(Byte,    jbyte,    byte,    s1)
 JNI_SET_ARRAY_REGION(Char,    jchar,    char,    u2)
 JNI_SET_ARRAY_REGION(Short,   jshort,   short,   s2)
 JNI_SET_ARRAY_REGION(Int,     jint,     int,     s4)
@@ -2979,14 +2979,10 @@ jint jni_RegisterNatives(JNIEnv* env, jclass clazz, const JNINativeMethod* metho
 
        classinfo* c = LLNI_classinfo_unwrap(clazz);
 
-       /* XXX: if implemented this needs a call to jvmti_NativeMethodBind
-       if (jvmti) jvmti_NativeMethodBind(method, address,  new_address_ptr);
-       */
-
        NativeMethods& nm = VM::get_current()->get_nativemethods();
        nm.register_methods(c->name, methods, nMethods);
 
-    return 0;
+       return 0;
 }