Bug 564303 - Clean up SWT Tools of 32-bit support

Removed JNI64 flag, and comparisons between 32 & 64 bit types/functions.
Changed functions & interfaces accordingly, to take away this
dependency.

Change-Id: I66adb0a4716f14a83df534c6c20f81a7ad60fc87
Signed-off-by: Paul D'Pong <sdamrong@redhat.com>

1 files changed, 3 insertions, 27 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java
index 7877ee0f8d..61262dc4ec 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/StatsGenerator.java
@@ -13,7 +13,7 @@
  *******************************************************************************/
 package org.eclipse.swt.tools.internal;
 
-import java.lang.reflect.Modifier;
+import java.lang.reflect.*;
 
 public class StatsGenerator extends JNIGenerator {
 
@@ -115,22 +115,10 @@ void generateSourceFile(JNIClass clazz) {
 	sort(methods);
 	for (JNIMethod method : methods) {
 		if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
-		String function = getFunctionName(method), function64 = getFunctionName(method, method.getParameterTypes64());
-		if (!function.equals(function64)) {
-			output("#ifndef ");
-			output(JNI64);
-			outputln();
-		}
+		String function = getFunctionName(method);
 		output("\t\"");
 		output(function);
 		outputln("\",");
-		if (!function.equals(function64)) {
-			outputln("#else");
-			output("\t\"");
-			output(function64);
-			outputln("\",");
-			outputln("#endif");
-		}
 		if (progress != null) progress.step();
 	}
 	outputln("};");
@@ -197,22 +185,10 @@ void generateFunctionEnum(JNIMethod[] methods) {
 	outputln("typedef enum {");
 	for (JNIMethod method : methods) {
 		if ((method.getModifiers() & Modifier.NATIVE) == 0) continue;
-		String function = getFunctionName(method), function64 = getFunctionName(method, method.getParameterTypes64());
-		if (!function.equals(function64)) {
-			output("#ifndef ");
-			output(JNI64);
-			outputln();
-		}
+		String function = getFunctionName(method);
 		output("\t");
 		output(function);
 		outputln("_FUNC,");
-		if (!function.equals(function64)) {
-			outputln("#else");
-			output("\t");
-			output(function64);
-			outputln("_FUNC,");
-			outputln("#endif");
-		}
 		if (progress != null) progress.step();
 	}
 	JNIClass clazz = methods[0].getDeclaringClass();