*** empty log message ***

2 files changed, 34 insertions, 46 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/swt.c b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/swt.c
index 438b5fa5f9..361c762ebb 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/swt.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/swt.c
@@ -231,6 +231,22 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_motif_OS_memmove__I_3BI
     }
 }
 
+JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_motif_OS_memmove__I_3CI
+  (JNIEnv *env, jclass that, jint dest, jcharArray src, jint count)
+{
+    jchar *src1;
+#ifdef DEBUG_CALL_PRINTS
+	fprintf(stderr, "memmove__I_3CI\n");
+#endif
+
+    /* don't do anything if src pointer is NULL */
+    if (src) {
+        src1 = (*env)->GetCharArrayElements(env, src, NULL);
+        memmove((void *)dest, (void *)src1, count);
+        (*env)->ReleaseCharArrayElements(env, src, src1, 0);
+    }
+}
+
 /*
  * Class:     org_eclipse_swt_internal_motif_OS
  * Method:    memmove
@@ -699,6 +715,22 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_motif_OS_memmove___3BII
     }
 }
 
+JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_motif_OS_memmove___3CII
+  (JNIEnv *env, jclass that, jcharArray dest, jint src, jint count)
+{
+    jchar *dest1;
+#ifdef DEBUG_CALL_PRINTS
+	fprintf(stderr, "memmove___3CII\n");
+#endif
+
+    /* don't do anything if dest pointer is NULL */
+    if (dest) {
+        dest1 = (*env)->GetCharArrayElements(env, dest, NULL);
+        memmove((void *)dest1, (void *)src, count);
+        (*env)->ReleaseCharArrayElements(env, dest, dest1, 0);
+    }
+}
+
 /*
  * Class:     org_eclipse_swt_internal_motif_OS
  * Method:    memmove
@@ -8505,52 +8537,6 @@ JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_motif_OS_MB_1CUR_1MAX
 
 /*
  * Class:     org_eclipse_swt_internal_motif_OS
- * Method:    memmove
- * Signature: ([CII)V
- */
-/*
-JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_motif_OS_memmove___3CII
-  (JNIEnv *env, jclass that, jcharArray dest, jint src, jint count)
-{
-    jchar *dest1;
-#ifdef DEBUG_CALL_PRINTS
-	fprintf(stderr, "memmove___3CII\n");
-#endif
-
-    if (dest) {
-        dest1 = (*env)->GetCharArrayElements(env, dest, NULL);
-        memmove((void *)dest1, (void *)src, count);
-        (*env)->ReleaseCharArrayElements(env, dest, dest1, 0);
-    }
-}
-*/
-
-/*
- * Class:     org_eclipse_swt_internal_motif_OS
- * Method:    memmove
- * Signature: (I[CI)V
- */
-/*
-JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_motif_OS_memmove__I_3CI
-  (JNIEnv *env, jclass that, jint dest, jcharArray src, jint count)
-{
-    jchar *src1;
-#ifdef DEBUG_CALL_PRINTS
-	fprintf(stderr, "memmove__I_3CI\n");
-#endif
-
-    if (src) {
-    	int i;
-    	unsigned char *dest1 = (unsigned char *)dest;
-        src1 = (*env)->GetCharArrayElements(env, src, NULL);
-        memmove((void *)dest, (void *)src1, count);
-        (*env)->ReleaseCharArrayElements(env, src, src1, 0);
-    }
-}
-*/
-
-/*
- * Class:     org_eclipse_swt_internal_motif_OS
  * Method:    XCreateFontSet
  * Signature: (I[B[I[I[I)I
  */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/OS.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/OS.java
index 9785e5da88..8cebfb1b9f 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/motif/OS.java
@@ -1238,6 +1238,7 @@ public static final native void memmove (int dest, XmDragProcCallback src, int c
 public static final native void memmove (int dest, XmTextBlockRec src, int count);

 public static final native void memmove (int dest, XmTextVerifyCallbackStruct src, int count);

 public static final native void memmove (int dest, byte [] src, int count);

+public static final native void memmove (int dest, char [] src, int count);

 public static final native void memmove (int dest, int [] src, int count);

 public static final native void memmove (Visual dest, int src, int count);

 public static final native void memmove (XButtonEvent dest, int src, int count);

@@ -1259,6 +1260,7 @@ public static final native void memmove (XmDropProcCallback dest, int src, int c
 public static final native void memmove (XmTextBlockRec dest, int src, int count);

 public static final native void memmove (XmTextVerifyCallbackStruct dest, int src, int count);

 public static final native void memmove (byte [] dest, int src, int count);

+public static final native void memmove (char [] dest, int src, int count);

 public static final native void memmove (int [] dest, int src, int count);

 public static final native int strlen (int string);

 public static final native int XmCreateDrawnButton (int parent, byte [] name, int [] arglist, int argcount);