1 files changed, 3 insertions, 21 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java
index 5816ce8fdb..5e67b4285b 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/NativesGenerator.java
@@ -11,7 +11,6 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Red Hat Inc. - stop generating pre 1.2 JNI code
- * Martin Oberhuber (WindRiver) - [515610] Fix incorrect code for memmove()
  *******************************************************************************/
 package org.eclipse.swt.tools.internal;
 
@@ -268,26 +267,9 @@ boolean generateGetParameter(JNIMethod method, JNIParameter param, boolean criti
 	if (paramType.isPrimitive() || isSystemClass(paramType)) return false;
 	String iStr = String.valueOf(param.getParameter());
 	for (int j = 0; j < indent; j++) output("\t");
-	//if(!paramType.isArray() && !paramType.isType("java.lang.String") && param.getFlag(FLAG_NO_IN)) {
-	if("memmove".equals(method.getName()) && param.getFlag(FLAG_NO_IN)) {
-		// Bug 515610: Fix incorect fall-through for memmove().
-		// A similar issue might be present in other cases as well. 
-		// Keep diagnostic code (commented-out) below for diagnosing these.
-		output("if (!arg");
-		output(iStr);
-		outputln(") goto fail;");
-		//output(") {fprintf(stderr,\"fail: method=");
-		//output(method.getName());
-		//output(", arg");
-		//output(iStr);
-		//output("\\n\"); goto fail;}\n");
-		for (int j = 0; j < indent; j++) output("\t");
-		output("if ((lparg");
-	} else {
-		output("if (arg");
-		output(iStr);
-		output(") if ((lparg");
-	}
+	output("if (arg");
+	output(iStr);
+	output(") if ((lparg");
 	output(iStr);
 	output(" = ");
 	boolean isCPP = getCPP();