X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=ikvm-jni%2Fmono-jni.c;h=77c8afadbd265b8b01e6b9a618bceb3046b0d530;hb=66aa57df8a6cc8abf2d38ded355d6740139ad762;hp=c90de6cde7efcf5c90c038b6573b033a96b88292;hpb=ff785c3085d21a5ddc51e5d706ea37cd729dd261;p=mono.git

diff --git a/ikvm-jni/mono-jni.c b/ikvm-jni/mono-jni.c
index c90de6cde7e..77c8afadbd2 100644
--- a/ikvm-jni/mono-jni.c
+++ b/ikvm-jni/mono-jni.c
@@ -149,8 +149,8 @@ StringFromUTF8 (const char* psz)
 	/* TODO: */
 	return mono_string_new (mono_domain_get (), psz);
 #if 0
-	// Sun's modified UTF8 encoding is not compatible with System::Text::Encoding::UTF8, so
-	// we need to roll our own
+	/* Sun's modified UTF8 encoding is not compatible with System::Text::Encoding::UTF8, so */
+	/* we need to roll our own */
 	int len, res_len, i;
 	int *res;
 
@@ -163,16 +163,16 @@ StringFromUTF8 (const char* psz)
 		switch (c >> 4)
 		{
 		case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
-			// 0xxxxxxx
+			/* 0xxxxxxx */
 			break;
 		case 12: case 13:
-			// 110x xxxx   10xx xxxx
+			/* 110x xxxx   10xx xxxx */
 			char2 = *psz++;
 			i++;
 			c = (((c & 0x1F) << 6) | (char2 & 0x3F));
 			break;
 		case 14:
-			// 1110 xxxx  10xx xxxx  10xx xxxx
+			/* 1110 xxxx  10xx xxxx  10xx xxxx */
 			char2 = *psz++;
 			char3 = *psz++;
 			i++;
@@ -327,7 +327,7 @@ InvokeHelper (JNIEnv *env, jobject object, jmethodID methodID, jvalue* args)
 	MonoObject **argarray;
 	MonoArray *args2;
 
-//	assert(!pLocalRefs->PendingException);
+/* assert(!pLocalRefs->PendingException); */
 	g_assert(methodID);
 
 	argc = GetMethodArgs(methodID, sig);
@@ -475,7 +475,7 @@ METHOD_IMPL(Double,jdouble)
 
 
 
-// TODO: These should be put into the macros above... 
+/* TODO: These should be put into the macros above...  */
 static void JNICALL CallVoidMethodA (JNIEnv *env, jobject obj, jmethodID methodID, jvalue * args) { 
 	InvokeHelper(env, obj, methodID, args);
 }
@@ -581,7 +581,7 @@ static type JNICALL GetStatic##Type##Field(JNIEnv *env, jclass clazz, jfieldID f
 
 
 
-//    return *(cpptype*)BOXED_VALUE (jniFuncs.GetFieldValue (fieldID, jniFuncs.UnwrapRef (obj))); 
+/*    return *(cpptype*)BOXED_VALUE (jniFuncs.GetFieldValue (fieldID, jniFuncs.UnwrapRef (obj)));  */
 
 GET_SET_FIELD(Boolean,jboolean,gboolean)
 GET_SET_FIELD(Byte,jbyte, gchar)
@@ -841,13 +841,13 @@ static void JNICALL Get##Type##ArrayRegion (JNIEnv *env, type##Array array, jsiz
 {\
     MonoArray *obj; \
 	obj = jniFuncs.UnwrapRef (env, (void*)array); \
-    memcpy (buf, mono_array_addr (obj, sizeof (type), start), (sizeof (type) * l)); \
+    memcpy (buf, mono_array_addr (obj, type, start), (sizeof (type) * l)); \
 } \
 static void JNICALL Set##Type##ArrayRegion (JNIEnv *env, type##Array array, jsize start, jsize l, type *buf) \
 { \
     MonoArray *obj; \
 	obj = jniFuncs.UnwrapRef (env, (void*)array); \
-    memcpy (mono_array_addr (obj, sizeof (type), start), buf, (sizeof (type) * l)); \
+    memcpy (mono_array_addr (obj, type, start), buf, (sizeof (type) * l)); \
 }
 
 GET_SET_ARRAY_ELEMENTS(Boolean,jboolean,gboolean)