From 5251f6612c0f087cbadc86a8741a9a3074dddb29 Mon Sep 17 00:00:00 2001
From: Nikita Nemkin
Date: Fri, 10 Jan 2020 00:42:57 +0500
Subject: Bug 559057 - [JNI] Remove traces of 32-bit support

Remove uses of 32-bit compatibility definitions like jintLong.

Change-Id: Ibdff499435f8cb3de4ea7c3adba153bb7bbbabbe
Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>
---
 .../Eclipse SWT AWT/cocoa/library/swt_awt.c        |   8 +-
 .../Eclipse SWT AWT/gtk/library/swt_awt.c          |   8 +-
 .../Eclipse SWT AWT/win32/library/swt_awt.c        |   8 +-
 .../Eclipse SWT PI/cocoa/library/os.h              |   2 +-
 .../Eclipse SWT PI/cocoa/library/os_custom.c       |  78 +-
 .../Eclipse SWT PI/gtk/library/os_custom.c         | 186 ++--
 .../Eclipse SWT PI/gtk/library/os_custom.h         |   6 +-
 .../Eclipse SWT PI/win32/library/os_custom.c       |   6 +-
 .../Eclipse SWT WebKit/gtk/library/webkitgtk.h     |   2 +-
 .../gtk/library/webkitgtk_custom.c                 |   6 +-
 .../gtk/library/webkitgtk_custom.h                 |   2 +-
 .../org/eclipse/swt/internal/webkit/WebKitGTK.java |   2 +-
 .../win32/library/webkit_win32_custom.cpp          |  44 +-
 .../Eclipse SWT/common/library/callback.c          | 967 +++++++++------------
 .../Eclipse SWT/common/library/callback.h          |  27 +-
 .../Eclipse SWT/common/library/swt.h               |  68 +-
 16 files changed, 609 insertions(+), 811 deletions(-)

diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library/swt_awt.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library/swt_awt.c
index be05c66c7e..ddb2e96141 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library/swt_awt.c	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library/swt_awt.c	
@@ -35,10 +35,10 @@ JAWT_MacOSXDrawingSurfaceInfo;
 
 
 #ifndef NO_getAWTHandle
-JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle)
+JNIEXPORT jlong JNICALL SWT_AWT_NATIVE(getAWTHandle)
 	(JNIEnv *env, jclass that, jobject canvas)
 {
-	jintLong result = 0;
+	jlong result = 0;
 	JAWT awt;
 	JAWT_DrawingSurface* ds;
 	JAWT_DrawingSurfaceInfo* dsi;
@@ -53,7 +53,7 @@ JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle)
 		 	if ((lock & JAWT_LOCK_ERROR) == 0) {
 			 	dsi = ds->GetDrawingSurfaceInfo(ds);
 				dsi_cocoa = (JAWT_MacOSXDrawingSurfaceInfo*)dsi->platformInfo;
-				result = (jintLong)dsi_cocoa->cocoaViewRef;
+				result = (jlong)dsi_cocoa->cocoaViewRef;
 				ds->FreeDrawingSurfaceInfo(dsi);
 				ds->Unlock(ds);
 			}
@@ -66,7 +66,7 @@ JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle)
 
 #ifndef NO_initFrame
 JNIEXPORT jobject JNICALL Java_org_eclipse_swt_awt_SWT_1AWT_initFrame
-	(JNIEnv *env, jclass that, jintLong handle, const char *className)
+	(JNIEnv *env, jclass that, jlong handle, const char *className)
 {
 	jobject object;
 	jmethodID constructor;
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c
index 789a04a89a..47ea741f47 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/library/swt_awt.c	
@@ -18,14 +18,14 @@
 #define SWT_AWT_NATIVE(func) Java_org_eclipse_swt_awt_SWT_1AWT_##func
 
 #ifndef NO_getAWTHandle
-JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle)
+JNIEXPORT jlong JNICALL SWT_AWT_NATIVE(getAWTHandle)
 	(JNIEnv *env, jclass that, jobject canvas)
 {
 	JAWT awt;
 	JAWT_DrawingSurface* ds;
 	JAWT_DrawingSurfaceInfo* dsi;
 	JAWT_X11DrawingSurfaceInfo* dsi_x11;
-	jintLong result = 0;
+	jlong result = 0;
 	jint lock;
 
 	awt.version = JAWT_VERSION_1_3;
@@ -36,7 +36,7 @@ JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle)
 		 	if ((lock & JAWT_LOCK_ERROR) == 0) {
 			 	dsi = ds->GetDrawingSurfaceInfo(ds);
 				dsi_x11 = (JAWT_X11DrawingSurfaceInfo*)dsi->platformInfo;
-				result = (jintLong)dsi_x11->drawable;
+				result = (jlong)dsi_x11->drawable;
 				ds->FreeDrawingSurfaceInfo(dsi);
 				ds->Unlock(ds);
 			}
@@ -77,7 +77,7 @@ JNIEXPORT void JNICALL SWT_AWT_NATIVE(setDebug)
 
 #ifndef NO_initFrame
 JNIEXPORT jobject JNICALL Java_org_eclipse_swt_awt_SWT_1AWT_initFrame
-	(JNIEnv *env, jclass that, jintLong handle)
+	(JNIEnv *env, jclass that, jlong handle)
 {
 	jobject object;
 	jmethodID constructor;
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c
index 98aff60d36..736a131bac 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library/swt_awt.c	
@@ -18,14 +18,14 @@
 #define SWT_AWT_NATIVE(func) Java_org_eclipse_swt_awt_SWT_1AWT_##func
 
 #ifndef NO_getAWTHandle
-JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle)
+JNIEXPORT jlong JNICALL SWT_AWT_NATIVE(getAWTHandle)
 	(JNIEnv *env, jclass that, jobject canvas)
 {
 	JAWT awt;
 	JAWT_DrawingSurface* ds;
 	JAWT_DrawingSurfaceInfo* dsi;
 	JAWT_Win32DrawingSurfaceInfo* dsi_win;
-	jintLong result = 0;
+	jlong result = 0;
 	jint lock;
 
 	awt.version = JAWT_VERSION_1_3;
@@ -36,7 +36,7 @@ JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle)
 		 	if ((lock & JAWT_LOCK_ERROR) == 0) {
 			 	dsi = ds->GetDrawingSurfaceInfo(ds);
 				dsi_win = (JAWT_Win32DrawingSurfaceInfo*)dsi->platformInfo;
-				result = (jintLong)dsi_win->hwnd;
+				result = (jlong)dsi_win->hwnd;
 				ds->FreeDrawingSurfaceInfo(dsi);
 				ds->Unlock(ds);
 			}
@@ -49,7 +49,7 @@ JNIEXPORT jintLong JNICALL SWT_AWT_NATIVE(getAWTHandle)
 
 #ifndef NO_initFrame
 JNIEXPORT jobject JNICALL SWT_AWT_NATIVE(initFrame)
-	(JNIEnv *env, jclass that, jintLong handle, jstring className)
+	(JNIEnv *env, jclass that, jlong handle, jstring className)
 {
 	jobject object;
 	jmethodID constructor;
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h
index 8166f08ccb..69dd08fc61 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h	
@@ -27,7 +27,7 @@
 
 #include "os_custom.h"
 
-extern jint CPSSetProcessName(void *, jintLong);
+extern jint CPSSetProcessName(void *, jlong);
 
 #define OS_LOAD_FUNCTION LOAD_FUNCTION
 
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c
index c38dfd8e84..f23e43daa6 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c	
@@ -29,7 +29,7 @@
 
 #ifndef NO_JNIGetObject
 JNIEXPORT jobject JNICALL OS_NATIVE(JNIGetObject)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	jobject rc = 0;
 	OS_NATIVE_ENTER(env, that, JNIGetObject_FUNC);
@@ -40,27 +40,27 @@ JNIEXPORT jobject JNICALL OS_NATIVE(JNIGetObject)
 #endif
 
 #ifndef NO_FindWindow
-JNIEXPORT jintLong JNICALL OS_NATIVE(FindWindow)
-(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(FindWindow)
+(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2)
 {
-	jintLong *lparg2=NULL;
-	jintLong rc = 0;
+	jlong *lparg2=NULL;
+	jlong rc = 0;
 	Point p;
 	p.h = (short)arg0;
 	p.v = (short)arg1;
 	OS_NATIVE_ENTER(env, that, FindWindow_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	/*
-	 rc = (jintLong)FindWindow(arg0, arg1, (WindowRef *)lparg2);
+	 rc = (jlong)FindWindow(arg0, arg1, (WindowRef *)lparg2);
 	 */
 	{
 		OS_LOAD_FUNCTION(fp, FindWindow)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(Point, WindowRef *))fp)(p, (WindowRef *)lparg2);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(Point, WindowRef *))fp)(p, (WindowRef *)lparg2);
 		}
 	}
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 		OS_NATIVE_EXIT(env, that, FindWindow_FUNC);
 		return rc;
 }
@@ -118,7 +118,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(_1_1BIG_1ENDIAN_1_1)
 
 #ifndef NO_class_1getName
 JNIEXPORT jstring JNICALL OS_NATIVE(class_1getName)
-(JNIEnv *env, jclass that, jintLong arg0)
+(JNIEnv *env, jclass that, jlong arg0)
 {
 	jstring rc = 0;
 	OS_NATIVE_ENTER(env, that, class_1getName_FUNC);
@@ -134,26 +134,26 @@ static BOOL isFlippedProc(id obj, SEL sel)
 {
 	return YES;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(isFlipped_1CALLBACK)
+JNIEXPORT jlong JNICALL OS_NATIVE(isFlipped_1CALLBACK)
 (JNIEnv *env, jclass that)
 {
-	return (jintLong)isFlippedProc;
+	return (jlong)isFlippedProc;
 }
 #endif
 
 #ifndef NO_kTISPropertyUnicodeKeyLayoutData
-JNIEXPORT jintLong JNICALL OS_NATIVE(kTISPropertyUnicodeKeyLayoutData)
+JNIEXPORT jlong JNICALL OS_NATIVE(kTISPropertyUnicodeKeyLayoutData)
 (JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, kTISPropertyUnicodeKeyLayoutData_FUNC);
 /*
-	rc = (jintLong) kTISPropertyUnicodeKeyLayoutData;
+	rc = (jlong) kTISPropertyUnicodeKeyLayoutData;
 */
 	{
 		LOAD_CFSTR(data, kTISPropertyUnicodeKeyLayoutData)
 		if (data) {
-			rc = (jintLong)(*data);
+			rc = (jlong)(*data);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, kTISPropertyUnicodeKeyLayoutData_FUNC);
@@ -162,18 +162,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(kTISPropertyUnicodeKeyLayoutData)
 #endif
 
 #ifndef NO_NSAccessibilityCellRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityCellRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityCellRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityCellRole_FUNC);
 /*
-	rc = (jintLong)NSAccessibilityCellRole;
+	rc = (jlong)NSAccessibilityCellRole;
 */
 	{
 		LOAD_CFSTR(data, NSAccessibilityCellRole)
 		if (data) {
-			rc = (jintLong)(*data);
+			rc = (jlong)(*data);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, NSAccessibilityCellRole_FUNC);
@@ -182,18 +182,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityCellRole)
 #endif
 
 #ifndef NO_NSAccessibilityColumnIndexRangeAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityColumnIndexRangeAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityColumnIndexRangeAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityColumnIndexRangeAttribute_FUNC);
 /*
-	rc = (jintLong)NSAccessibilityColumnIndexRangeAttribute;
+	rc = (jlong)NSAccessibilityColumnIndexRangeAttribute;
 */
 	{
 		LOAD_CFSTR(data, NSAccessibilityColumnIndexRangeAttribute)
 		if (data) {
-			rc = (jintLong)(*data);
+			rc = (jlong)(*data);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, NSAccessibilityColumnIndexRangeAttribute_FUNC);
@@ -202,18 +202,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityColumnIndexRangeAttribute)
 #endif
 
 #ifndef NO_NSAccessibilityCellForColumnAndRowParameterizedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityCellForColumnAndRowParameterizedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityCellForColumnAndRowParameterizedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityCellForColumnAndRowParameterizedAttribute_FUNC);
 /*
-	rc = (jintLong)NSAccessibilityCellForColumnAndRowParameterizedAttribute;
+	rc = (jlong)NSAccessibilityCellForColumnAndRowParameterizedAttribute;
 */
 	{
 		LOAD_CFSTR(data, NSAccessibilityCellForColumnAndRowParameterizedAttribute)
 		if (data) {
-			rc = (jintLong)(*data);
+			rc = (jlong)(*data);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, NSAccessibilityCellForColumnAndRowParameterizedAttribute_FUNC);
@@ -222,18 +222,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityCellForColumnAndRowParameter
 #endif
 
 #ifndef NO_NSAccessibilityRowIndexRangeAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRowIndexRangeAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRowIndexRangeAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRowIndexRangeAttribute_FUNC);
 /*
-	rc = (jintLong)NSAccessibilityRowIndexRangeAttribute;
+	rc = (jlong)NSAccessibilityRowIndexRangeAttribute;
 */
 	{
 		LOAD_CFSTR(data, NSAccessibilityRowIndexRangeAttribute)
 		if (data) {
-			rc = (jintLong)(*data);
+			rc = (jlong)(*data);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRowIndexRangeAttribute_FUNC);
@@ -241,15 +241,15 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRowIndexRangeAttribute)
 }
 #endif
 
-typedef void (*FunctionPointer)(jintLong result);
-typedef void (^ObjcBlock)(jintLong result);
+typedef void (*FunctionPointer)(jlong result);
+typedef void (^ObjcBlock)(jlong result);
 
 /*
 Method that takes a function pointer as input and returns a objective-c block
 which calls the function pointed to by the function pointer.
 */
 ObjcBlock functionToBlock(FunctionPointer func) {
-    return [[^(jintLong result) {
+    return [[^(jlong result) {
                  func(result);
              } copy] autorelease];
 }
@@ -259,14 +259,14 @@ Wrapper function which receives a function pointer from Java and calls NSSavePan
 with objective-C block (with block syntax) as the last parameter.
 */ 
 #ifndef NO_beginSheetModalForWindow
-JNIEXPORT jintLong JNICALL OS_NATIVE(beginSheetModalForWindow)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, FunctionPointer arg3)
+JNIEXPORT jlong JNICALL OS_NATIVE(beginSheetModalForWindow)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, FunctionPointer arg3)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	
 	OS_NATIVE_ENTER(env, that, beginSheetModalForWindow_FUNC);
 	
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, void (^)(jintLong)))objc_msgSend)(arg0, arg1, arg2, functionToBlock(arg3));
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, void (^)(jlong)))objc_msgSend)(arg0, arg1, arg2, functionToBlock(arg3));
 	
 	OS_NATIVE_EXIT(env, that, beginSheetModalForWindow_FUNC);
 	return rc;
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c
index 27629683ce..6fef2cf06e 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c	
@@ -30,7 +30,7 @@ JNIEXPORT void JNICALL OS_NATIVE(_1cachejvmptr)
 
 #ifndef NO__1call_1get_1size
 JNIEXPORT void JNICALL OS_NATIVE(_1call_1get_1size)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
 {
    /*
    * Bug in Solaris. For some reason, the assembler generated for this function (when not putting the parameters in the stack)  crashes. 
@@ -94,7 +94,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(GDK_1WINDOWING_1WAYLAND)
 #endif
 
 #ifndef NO_imContextNewProc_1CALLBACK
-static jintLong superIMContextNewProc;
+static jlong superIMContextNewProc;
 static GtkIMContext* lastIMContext;
 static GtkIMContext* imContextNewProc (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) {
 	GtkIMContext* context = ((GtkIMContext * (*)(GType, guint, GObjectConstructParam *))superIMContextNewProc)(type, n_construct_properties, construct_properties);
@@ -102,96 +102,96 @@ static GtkIMContext* imContextNewProc (GType type, guint n_construct_properties,
 	return context;
 }
 #ifndef NO_imContextLast
-JNIEXPORT jintLong JNICALL OS_NATIVE(imContextLast)
+JNIEXPORT jlong JNICALL OS_NATIVE(imContextLast)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, imContextLast_FUNC);
-	rc = (jintLong)lastIMContext;
+	rc = (jlong)lastIMContext;
 	OS_NATIVE_EXIT(env, that, imContextLast_FUNC);
 	return rc;
 }
 #endif
 
-JNIEXPORT jintLong JNICALL OS_NATIVE(imContextNewProc_1CALLBACK)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(imContextNewProc_1CALLBACK)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, imContextNewProc_1CALLBACK_FUNC);
 	superIMContextNewProc = arg0;
-	rc = (jintLong)imContextNewProc;
+	rc = (jlong)imContextNewProc;
 	OS_NATIVE_EXIT(env, that, imContextNewProc_1CALLBACK_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_pangoLayoutNewProc_1CALLBACK
-static jintLong superPangoLayoutNewProc;
+static jlong superPangoLayoutNewProc;
 static PangoLayout * pangoLayoutNewProc (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) {
 	PangoLayout* layout = ((PangoLayout * (*)(GType, guint, GObjectConstructParam *))superPangoLayoutNewProc)(type, n_construct_properties, construct_properties);
 	pango_layout_set_auto_dir (layout, 0);
 	return layout;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(pangoLayoutNewProc_1CALLBACK)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(pangoLayoutNewProc_1CALLBACK)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, pangoLayoutNewProc_1CALLBACK_FUNC);
 	superPangoLayoutNewProc = arg0;
-	rc = (jintLong)pangoLayoutNewProc;
+	rc = (jlong)pangoLayoutNewProc;
 	OS_NATIVE_EXIT(env, that, pangoLayoutNewProc_1CALLBACK_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_pangoFontFamilyNewProc_1CALLBACK
-static jintLong superPangoFontFamilyNewProc;
+static jlong superPangoFontFamilyNewProc;
 static PangoFontFamily * pangoFontFamilyNewProc (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) {
 	PangoFontFamily* fontFamily = ((PangoFontFamily * (*)(GType, guint, GObjectConstructParam *))superPangoFontFamilyNewProc)(type, n_construct_properties, construct_properties);
 	return fontFamily;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(pangoFontFamilyNewProc_1CALLBACK)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(pangoFontFamilyNewProc_1CALLBACK)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, pangoFontFamilyNewProc_1CALLBACK_FUNC);
 	superPangoFontFamilyNewProc = arg0;
-	rc = (jintLong)pangoFontFamilyNewProc;
+	rc = (jlong)pangoFontFamilyNewProc;
 	OS_NATIVE_EXIT(env, that, pangoFontFamilyNewProc_1CALLBACK_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_pangoFontFaceNewProc_1CALLBACK
-static jintLong superPangoFontFaceNewProc;
+static jlong superPangoFontFaceNewProc;
 static PangoFontFace * pangoFontFaceNewProc (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) {
 	PangoFontFace* fontFace = ((PangoFontFace * (*)(GType, guint, GObjectConstructParam *))superPangoFontFaceNewProc)(type, n_construct_properties, construct_properties);
 	return fontFace;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(pangoFontFaceNewProc_1CALLBACK)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(pangoFontFaceNewProc_1CALLBACK)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, pangoFontFaceNewProc_1CALLBACK_FUNC);
 	superPangoFontFaceNewProc = arg0;
-	rc = (jintLong)pangoFontFaceNewProc;
+	rc = (jlong)pangoFontFaceNewProc;
 	OS_NATIVE_EXIT(env, that, pangoFontFaceNewProc_1CALLBACK_FUNC);
 	return rc;
 }
 #endif
 #ifndef NO_printerOptionWidgetNewProc_1CALLBACK
-static jintLong superPrinterOptionWidgetNewProc;
+static jlong superPrinterOptionWidgetNewProc;
 static GType * printerOptionWidgetNewProc (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) {
 	GType* printerOptionWidget = ((GType * (*)(GType, guint, GObjectConstructParam *))superPrinterOptionWidgetNewProc)(type, n_construct_properties, construct_properties);
 	return printerOptionWidget;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(printerOptionWidgetNewProc_1CALLBACK)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(printerOptionWidgetNewProc_1CALLBACK)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, printerOptionWidgetNewProc_1CALLBACK_FUNC);
 	superPrinterOptionWidgetNewProc = arg0;
-	rc = (jintLong)printerOptionWidgetNewProc;
+	rc = (jlong)printerOptionWidgetNewProc;
 	OS_NATIVE_EXIT(env, that, printerOptionWidgetNewProc_1CALLBACK_FUNC);
 	return rc;
 }
@@ -1253,7 +1253,7 @@ AtkObject *swt_fixed_accessible_new (GtkWidget *widget) {
 static void swt_fixed_accessible_finalize (GObject *object) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (object);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	// Call the Java implementation to ensure AccessibleObjects are removed
 	// from the HashMap on the Java side.
@@ -1305,7 +1305,7 @@ static void swt_fixed_accessible_initialize (AtkObject *obj, gpointer data) {
 static AtkAttributeSet *swt_fixed_accessible_get_attributes (AtkObject *obj) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (obj);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkObject_get_attributes", "(J)J", obj);
@@ -1318,7 +1318,7 @@ static AtkAttributeSet *swt_fixed_accessible_get_attributes (AtkObject *obj) {
 static const gchar *swt_fixed_accessible_get_description (AtkObject *obj) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (obj);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkObject_get_description", "(J)J", obj);
@@ -1331,7 +1331,7 @@ static const gchar *swt_fixed_accessible_get_description (AtkObject *obj) {
 static gint swt_fixed_accessible_get_index_in_parent (AtkObject *obj) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (obj);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkObject_get_index_in_parent", "(J)J", obj);
@@ -1344,7 +1344,7 @@ static gint swt_fixed_accessible_get_index_in_parent (AtkObject *obj) {
 static gint swt_fixed_accessible_get_n_children (AtkObject *obj) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (obj);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkObject_get_n_children", "(J)J", obj);
@@ -1357,7 +1357,7 @@ static gint swt_fixed_accessible_get_n_children (AtkObject *obj) {
 static const gchar *swt_fixed_accessible_get_name (AtkObject *obj) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (obj);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkObject_get_name", "(J)J", obj);
@@ -1370,7 +1370,7 @@ static const gchar *swt_fixed_accessible_get_name (AtkObject *obj) {
 static AtkObject *swt_fixed_accessible_get_parent (AtkObject *obj) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (obj);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkObject_get_parent", "(J)J", obj);
@@ -1383,7 +1383,7 @@ static AtkObject *swt_fixed_accessible_get_parent (AtkObject *obj) {
 static AtkRole swt_fixed_accessible_get_role (AtkObject *obj) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (obj);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkObject_get_role", "(J)J", obj);
@@ -1396,7 +1396,7 @@ static AtkRole swt_fixed_accessible_get_role (AtkObject *obj) {
 static AtkObject *swt_fixed_accessible_ref_child (AtkObject *obj, gint i) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (obj);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkObject_ref_child", "(JJ)J", obj, i);
@@ -1409,7 +1409,7 @@ static AtkObject *swt_fixed_accessible_ref_child (AtkObject *obj, gint i) {
 static AtkStateSet *swt_fixed_accesssible_ref_state_set (AtkObject *obj) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (obj);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkObject_ref_state_set", "(J)J", obj);
@@ -1422,7 +1422,7 @@ static AtkStateSet *swt_fixed_accesssible_ref_state_set (AtkObject *obj) {
 static gboolean swt_fixed_accessible_action_do_action (AtkAction *action, gint i) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (action);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkAction_do_action", "(JJ)J", action, i);
@@ -1433,7 +1433,7 @@ static gboolean swt_fixed_accessible_action_do_action (AtkAction *action, gint i
 static const gchar *swt_fixed_accessible_action_get_description (AtkAction *action, gint i) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (action);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkAction_get_description", "(JJ)J", action, i);
@@ -1444,7 +1444,7 @@ static const gchar *swt_fixed_accessible_action_get_description (AtkAction *acti
 static const gchar *swt_fixed_accessible_action_get_keybinding (AtkAction *action, gint i) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (action);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkAction_get_keybinding", "(JJ)J", action, i);
@@ -1455,7 +1455,7 @@ static const gchar *swt_fixed_accessible_action_get_keybinding (AtkAction *actio
 static gint swt_fixed_accessible_action_get_n_actions (AtkAction *action) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (action);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkAction_get_n_actions", "(J)J", action);
@@ -1466,7 +1466,7 @@ static gint swt_fixed_accessible_action_get_n_actions (AtkAction *action) {
 static const gchar *swt_fixed_accessible_action_get_name (AtkAction *action, gint i) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (action);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkAction_get_name", "(JJ)J", action, i);
@@ -1527,7 +1527,7 @@ static AtkObject *swt_fixed_accessible_component_ref_accessible_at_point (AtkCom
 		gint y, AtkCoordType coord_type) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (component);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkComponent_ref_accessible_at_point", "(JJJJ)J",
@@ -1591,7 +1591,7 @@ static gboolean swt_fixed_accessible_editable_text_set_run_attributes (AtkEditab
 		AtkAttributeSet *attrib_set, gint start_offset, gint end_offset) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkEditableText_set_run_attributes", "(JJJJ)J",
@@ -1613,7 +1613,7 @@ static void swt_fixed_accessible_editable_text_set_text_contents (AtkEditableTex
 static AtkHyperlink *swt_fixed_accessible_hypertext_get_link (AtkHypertext *hypertext, gint link_index) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (hypertext);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkHypertext_get_link", "(JJ)J", hypertext, link_index);
@@ -1624,7 +1624,7 @@ static AtkHyperlink *swt_fixed_accessible_hypertext_get_link (AtkHypertext *hype
 static gint swt_fixed_accessible_hypertext_get_link_index (AtkHypertext *hypertext, gint char_index) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (hypertext);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkHypertext_get_link_index", "(JJ)J", hypertext, char_index);
@@ -1635,7 +1635,7 @@ static gint swt_fixed_accessible_hypertext_get_link_index (AtkHypertext *hyperte
 static gint swt_fixed_accessible_hypertext_get_n_links (AtkHypertext *hypertext) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (hypertext);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkHypertext_get_n_links", "(J)J", hypertext);
@@ -1646,7 +1646,7 @@ static gint swt_fixed_accessible_hypertext_get_n_links (AtkHypertext *hypertext)
 static gboolean swt_fixed_accessible_selection_is_child_selected (AtkSelection *selection, gint i) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (selection);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkSelection_is_child_selected", "(JJ)J", selection, i);
@@ -1657,7 +1657,7 @@ static gboolean swt_fixed_accessible_selection_is_child_selected (AtkSelection *
 static AtkObject *swt_fixed_accessible_selection_ref_selection (AtkSelection *selection, gint i) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (selection);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkSelection_ref_selection", "(JJ)J", selection, i);
@@ -1668,7 +1668,7 @@ static AtkObject *swt_fixed_accessible_selection_ref_selection (AtkSelection *se
 static AtkObject *swt_fixed_accessible_table_ref_at (AtkTable *table, gint row, gint column) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_ref_at", "(JJJ)J", table, row, column);
@@ -1679,7 +1679,7 @@ static AtkObject *swt_fixed_accessible_table_ref_at (AtkTable *table, gint row,
 static gint swt_fixed_accessible_table_get_index_at (AtkTable *table, gint row, gint column) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_index_at", "(JJJ)J", table, row, column);
@@ -1690,7 +1690,7 @@ static gint swt_fixed_accessible_table_get_index_at (AtkTable *table, gint row,
 static gint swt_fixed_accessible_table_get_column_at_index (AtkTable *table, gint index) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_column_at_index", "(JJ)J", table, index);
@@ -1701,7 +1701,7 @@ static gint swt_fixed_accessible_table_get_column_at_index (AtkTable *table, gin
 static gint swt_fixed_accessible_table_get_row_at_index (AtkTable *table, gint index) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_row_at_index", "(JJ)J", table, index);
@@ -1712,7 +1712,7 @@ static gint swt_fixed_accessible_table_get_row_at_index (AtkTable *table, gint i
 static gint swt_fixed_accessible_table_get_n_columns (AtkTable *table) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_n_columns", "(J)J", table);
@@ -1723,7 +1723,7 @@ static gint swt_fixed_accessible_table_get_n_columns (AtkTable *table) {
 static gint swt_fixed_accessible_table_get_n_rows (AtkTable *table) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_n_rows", "(J)J", table);
@@ -1734,7 +1734,7 @@ static gint swt_fixed_accessible_table_get_n_rows (AtkTable *table) {
 static gint swt_fixed_accessible_table_get_column_extent_at (AtkTable *table, gint row, gint column) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_column_extent_at", "(JJJ)J",
@@ -1746,7 +1746,7 @@ static gint swt_fixed_accessible_table_get_column_extent_at (AtkTable *table, gi
 static gint swt_fixed_accessible_table_get_row_extent_at (AtkTable *table, gint row, gint column) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_row_extent_at", "(JJJ)J",
@@ -1758,7 +1758,7 @@ static gint swt_fixed_accessible_table_get_row_extent_at (AtkTable *table, gint
 static AtkObject *swt_fixed_accessible_table_get_caption (AtkTable *table) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_caption", "(J)J", table);
@@ -1769,7 +1769,7 @@ static AtkObject *swt_fixed_accessible_table_get_caption (AtkTable *table) {
 static AtkObject *swt_fixed_accessible_table_get_summary (AtkTable *table) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_summary", "(J)J", table);
@@ -1780,7 +1780,7 @@ static AtkObject *swt_fixed_accessible_table_get_summary (AtkTable *table) {
 static const gchar *swt_fixed_accessible_table_get_column_description (AtkTable *table, gint column) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_column_description", "(JJ)J",
@@ -1792,7 +1792,7 @@ static const gchar *swt_fixed_accessible_table_get_column_description (AtkTable
 static AtkObject *swt_fixed_accessible_table_get_column_header (AtkTable *table, gint column) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_column_header", "(JJ)J",
@@ -1804,7 +1804,7 @@ static AtkObject *swt_fixed_accessible_table_get_column_header (AtkTable *table,
 static const gchar *swt_fixed_accessible_table_get_row_description (AtkTable *table, gint row) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_row_description", "(JJ)J",
@@ -1816,7 +1816,7 @@ static const gchar *swt_fixed_accessible_table_get_row_description (AtkTable *ta
 static AtkObject *swt_fixed_accessible_table_get_row_header (AtkTable *table, gint row) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_row_header", "(JJ)J",
@@ -1828,7 +1828,7 @@ static AtkObject *swt_fixed_accessible_table_get_row_header (AtkTable *table, gi
 static gint swt_fixed_accessible_table_get_selected_rows (AtkTable *table, gint **selected) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_selected_rows", "(JJ)J",
@@ -1840,7 +1840,7 @@ static gint swt_fixed_accessible_table_get_selected_rows (AtkTable *table, gint
 static gint swt_fixed_accessible_table_get_selected_columns (AtkTable *table, gint **selected) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_get_selected_columns", "(JJ)J",
@@ -1852,7 +1852,7 @@ static gint swt_fixed_accessible_table_get_selected_columns (AtkTable *table, gi
 static gboolean swt_fixed_accessible_table_is_column_selected (AtkTable *table, gint column) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_is_column_selected", "(JJ)J",
@@ -1864,7 +1864,7 @@ static gboolean swt_fixed_accessible_table_is_column_selected (AtkTable *table,
 static gboolean swt_fixed_accessible_table_is_row_selected (AtkTable *table, gint row) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_is_row_selected", "(JJ)J",
@@ -1876,7 +1876,7 @@ static gboolean swt_fixed_accessible_table_is_row_selected (AtkTable *table, gin
 static gboolean swt_fixed_accessible_table_is_selected (AtkTable *table, gint row, gint column) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_is_selected", "(JJJ)J",
@@ -1888,7 +1888,7 @@ static gboolean swt_fixed_accessible_table_is_selected (AtkTable *table, gint ro
 static gboolean swt_fixed_accessible_table_add_row_selection (AtkTable *table, gint row) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_add_row_selection", "(JJ)J",
@@ -1900,7 +1900,7 @@ static gboolean swt_fixed_accessible_table_add_row_selection (AtkTable *table, g
 static gboolean swt_fixed_accessible_table_remove_row_selection (AtkTable *table, gint row) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_remove_row_selection", "(JJ)J",
@@ -1912,7 +1912,7 @@ static gboolean swt_fixed_accessible_table_remove_row_selection (AtkTable *table
 static gboolean swt_fixed_accessible_table_add_column_selection (AtkTable *table, gint column) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_add_column_selection", "(JJ)J",
@@ -1924,7 +1924,7 @@ static gboolean swt_fixed_accessible_table_add_column_selection (AtkTable *table
 static gboolean swt_fixed_accessible_table_remove_column_selection (AtkTable *table, gint column) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (table);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkTable_remove_row_selection", "(JJ)J",
@@ -1936,7 +1936,7 @@ static gboolean swt_fixed_accessible_table_remove_column_selection (AtkTable *ta
 static gboolean swt_fixed_accessible_text_add_selection (AtkText *text, gint start_offset, gint end_offset) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_add_selection", "(JJJ)J",
@@ -1949,7 +1949,7 @@ static AtkTextRange **swt_fixed_accessible_text_get_bounded_ranges (AtkText *tex
 		AtkCoordType coord_type, AtkTextClipType x_clip_type, AtkTextClipType y_clip_type) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_get_bounded_ranges", "(JJJJJ)J",
@@ -1961,7 +1961,7 @@ static AtkTextRange **swt_fixed_accessible_text_get_bounded_ranges (AtkText *tex
 static gint swt_fixed_accessible_text_get_caret_offset (AtkText *text) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_get_caret_offset", "(J)J", text);
@@ -1972,7 +1972,7 @@ static gint swt_fixed_accessible_text_get_caret_offset (AtkText *text) {
 static gunichar swt_fixed_accessible_text_get_character_at_offset (AtkText *text, gint offset) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_get_character_at_offset", "(JJ)J", text, offset);
@@ -1983,7 +1983,7 @@ static gunichar swt_fixed_accessible_text_get_character_at_offset (AtkText *text
 static gint swt_fixed_accessible_text_get_character_count (AtkText *text) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_get_character_count", "(J)J", text);
@@ -1994,7 +1994,7 @@ static gint swt_fixed_accessible_text_get_character_count (AtkText *text) {
 static gint swt_fixed_accessible_text_get_n_selections (AtkText *text) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_get_n_selections", "(J)J", text);
@@ -2006,7 +2006,7 @@ static gint swt_fixed_accessible_text_get_offset_at_point (AtkText *text, gint x
 		AtkCoordType coords) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_get_offset_at_point", "(JJJJ)J", text, x, y, coords);
@@ -2030,7 +2030,7 @@ static AtkAttributeSet *swt_fixed_accessible_text_get_run_attributes (AtkText *t
 		gint *end_offset) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_get_run_attributes", "(JJJJ)J", text,
@@ -2043,7 +2043,7 @@ static gchar *swt_fixed_accessible_text_get_selection (AtkText *text, gint selec
 		gint *end_offset) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_get_selection", "(JJJJ)J", text,
@@ -2055,7 +2055,7 @@ static gchar *swt_fixed_accessible_text_get_selection (AtkText *text, gint selec
 static gchar *swt_fixed_accessible_text_get_text (AtkText *text, gint start_offset, gint end_offset) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_get_text", "(JJJ)J", text,
@@ -2068,7 +2068,7 @@ static gchar *swt_fixed_accessible_text_get_text_after_offset (AtkText *text, gi
 		AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_get_text_after_offset", "(JJJJJ)J", text,
@@ -2081,7 +2081,7 @@ static gchar *swt_fixed_accessible_text_get_text_at_offset (AtkText *text, gint
 		AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_get_text_at_offset", "(JJJJJ)J", text,
@@ -2094,7 +2094,7 @@ static gchar *swt_fixed_accessible_text_get_text_before_offset (AtkText *text, g
 		AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_get_text_before_offset", "(JJJJJ)J", text,
@@ -2106,7 +2106,7 @@ static gchar *swt_fixed_accessible_text_get_text_before_offset (AtkText *text, g
 static gboolean swt_fixed_accessible_text_remove_selection (AtkText *text, gint selection_num) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_remove_selection", "(JJ)J", text, selection_num);
@@ -2117,7 +2117,7 @@ static gboolean swt_fixed_accessible_text_remove_selection (AtkText *text, gint
 static gboolean swt_fixed_accessible_text_set_caret_offset (AtkText *text, gint offset) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_set_caret_offset", "(JJ)J", text, offset);
@@ -2129,7 +2129,7 @@ static gboolean swt_fixed_accessible_text_set_selection (AtkText *text, gint sel
 		gint start_offset, gint end_offset) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (text);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkText_set_selection", "(JJJJ)J", text,
@@ -2171,7 +2171,7 @@ static void swt_fixed_accessible_value_get_minimum_value (AtkValue *obj, GValue
 static gboolean swt_fixed_accessible_value_set_current_value (AtkValue *obj, const GValue *value) {
 	SwtFixedAccessible *fixed = SWT_FIXED_ACCESSIBLE (obj);
 	SwtFixedAccessiblePrivate *private = fixed->priv;
-	jintLong returned_value = 0;
+	jlong returned_value = 0;
 
 	if (private->has_accessible) {
 		returned_value = call_accessible_object_function("atkValue_set_current_value", "(JJ)J", obj, value);
@@ -2272,8 +2272,8 @@ static void swt_fixed_accessible_value_iface_init (AtkValueIface *iface) {
 	iface->set_current_value = swt_fixed_accessible_value_set_current_value;
 }
 
-jintLong call_accessible_object_function (const char *method_name, const char *method_signature,...) {
-	jintLong result = 0;
+jlong call_accessible_object_function (const char *method_name, const char *method_signature,...) {
+	jlong result = 0;
 	va_list arg_list;
 	jclass cls;
 	JNIEnv *env;
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h
index a44efaad5b..e56bd8f02c 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h	
@@ -92,11 +92,11 @@ struct _GtkAccelLabelPrivate
 // NOTE: functions like gtk_false need to be linked to a lib. Eg see gtk_false_LIB above.
 #define GET_FUNCTION_POINTER_gtk_false() 0; \
 GTK_LOAD_FUNCTION(fp, gtk_false) \
-rc = (jintLong)fp;
+rc = (jlong)fp;
 
 #define gtk_status_icon_position_menu_func() 0; \
 GTK_LOAD_FUNCTION(fp, gtk_status_icon_position_menu) \
-rc = (jintLong)fp;
+rc = (jlong)fp;
 
 glong g_utf16_pointer_to_offset(const gchar*, const gchar*);
 gchar* g_utf16_offset_to_pointer(const gchar*, glong);
@@ -166,7 +166,7 @@ struct _SwtFixedAccessibleClass
 GType swt_fixed_accessible_get_type (void) G_GNUC_CONST;
 AtkObject *swt_fixed_accessible_new (GtkWidget *widget);
 void swt_fixed_accessible_register_accessible (AtkObject *obj, gboolean is_native, GtkWidget *to_map);
-jintLong call_accessible_object_function (const char *method_name, const char *method_signature,...);
+jlong call_accessible_object_function (const char *method_name, const char *method_signature,...);
 
 void swt_debug_on_fatal_warnings() ;
 
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
index e9fb072b2f..da2a770ff7 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c	
@@ -38,12 +38,12 @@ BOOL WINAPI DllMain(HANDLE hInstDLL, DWORD dwReason, LPVOID lpvReserved)
 }
 
 #ifndef NO_GetLibraryHandle
-JNIEXPORT jintLong JNICALL OS_NATIVE(GetLibraryHandle)
+JNIEXPORT jlong JNICALL OS_NATIVE(GetLibraryHandle)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc;
+	jlong rc;
 	OS_NATIVE_ENTER(env, that, GetLibraryHandle_FUNC)
-	rc = (jintLong)g_hInstance;
+	rc = (jlong)g_hInstance;
 	OS_NATIVE_EXIT(env, that, GetLibraryHandle_FUNC)
 	return rc;
 }
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
index 939c856225..49d6b9d6ac 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h	
@@ -26,7 +26,7 @@
 // For JNI bindings in webkitgtk.c to properly link to custom functions:
 #include "webkitgtk_custom.h"
 
-#include "swt.h"  // for jintlong used by custom struct below.
+#include "swt.h"
 
 /**
  * Conceptually the macro does:
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.c
index 7a6ad5c1e4..966465ecb5 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.c	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.c	
@@ -17,7 +17,7 @@
 //#include <stdbool.h>		   // for standard true/false
 //#include <gio/gio.h>	       // For things like GAsyncResult
 
-#include "swt.h"		       // For types like jintLong etc..
+#include "swt.h"
 
 #include "webkitgtk.h"         // For WebKitGTK_LOAD_FUNCTION macro and custom struct definitions.
 #include "webkitgtk_custom.h"
@@ -44,7 +44,7 @@ int fps_cached = 0;
 /** Dynamic Function pointer declarations */
 // Example of a dynamic function declaration.
 // dyn_WebKitJavascriptResult  (*fp_webkit_web_view_run_javascript_finish) 	 (dyn_WebKitWebView, GAsyncResult*, GError**);
-// // example call of this function would be: fp_webkit_web_view_run_javascript_finish ((jintLong) object, result, &error);
+// // example call of this function would be: fp_webkit_web_view_run_javascript_finish ((jlong) object, result, &error);
 
 #define INIT_WEBKIT_FP(function) \
 		{ \
@@ -69,7 +69,7 @@ void initFPs() {
 
 // Example of a function that makes dynamic calls.
 //JNIEXPORT void Java_org_eclipse_swt_internal_webkit_WebKitGTK__1swtWebkitEvaluateJavascript
-//	(JNIEnv *env, jclass that, jintLong webkit_handle, jbyteArray javascriptStringBytes, jobject swtjsreturnvalOBJ)
+//	(JNIEnv *env, jclass that, jlong webkit_handle, jbyteArray javascriptStringBytes, jobject swtjsreturnvalOBJ)
 //{
 //	WebKitGTK_NATIVE_ENTER(env, that, _1swtWebkitEvaluateJavascript_FUNC); // For native stats tool.
 //// In your custom function, you should first ensure function pointers are initiated:
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.h
index 6ffc94b4c1..53511fb9a2 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.h	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_custom.h	
@@ -18,7 +18,7 @@
 
 /* Manually written code */
 /** Dynamic type definitions */
-typedef jintLong 	dyn_WebKitWebView;
+typedef jlong 	dyn_WebKitWebView;
 typedef gpointer 	dyn_WebKitJavascriptResult;
 typedef gpointer 	dyn_JSContextRef;
 typedef gpointer 	dyn_JSGlobalContextRef;
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
index 6626059a62..3f9fd6a871 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java	
@@ -419,7 +419,7 @@
 }
 
 // Signature: 	   void webkit_javascript_result_unref (WebKitJavascriptResult *js_result);
-// Type Note:      WebKitJavascriptResult -> gpointer -> jintLong
+// Type Note:      WebKitJavascriptResult -> gpointer -> jlong
 /** @method flags=dynamic */
 public static final native void _webkit_javascript_result_unref(long /*int*/ js_result);
 public static final void webkit_javascript_result_unref(long /*int*/ js_result) {
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp
index 2b9e17324e..860c2d4a1c 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp	
@@ -19,69 +19,69 @@
 #define WebKit_win32_NATIVE(func) Java_org_eclipse_swt_internal_webkit_WebKit_1win32_##func
 
 #ifndef NO_willPerformClientRedirectToURL_1CALLBACK
-static jintLong willPerformClientRedirectToURL_CALLBACK;
-static HRESULT CALLBACK willPerformClientRedirectToURL(void* ppVTable, jintLong webView, BSTR url, double delaySeconds, DATE fireDate, jintLong frame)
+static jlong willPerformClientRedirectToURL_CALLBACK;
+static HRESULT CALLBACK willPerformClientRedirectToURL(void* ppVTable, jlong webView, BSTR url, double delaySeconds, DATE fireDate, jlong frame)
 {
-	return ((HRESULT (CALLBACK *)(void*, jintLong, BSTR, double*, DATE*, jintLong))willPerformClientRedirectToURL_CALLBACK)(ppVTable, webView, url, &delaySeconds, &fireDate, frame);
+	return ((HRESULT (CALLBACK *)(void*, jlong, BSTR, double*, DATE*, jlong))willPerformClientRedirectToURL_CALLBACK)(ppVTable, webView, url, &delaySeconds, &fireDate, frame);
 }
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(willPerformClientRedirectToURL_1CALLBACK) (JNIEnv *env, jclass that, jintLong func);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(willPerformClientRedirectToURL_1CALLBACK) (JNIEnv *env, jclass that, jintLong func)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(willPerformClientRedirectToURL_1CALLBACK) (JNIEnv *env, jclass that, jlong func);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(willPerformClientRedirectToURL_1CALLBACK) (JNIEnv *env, jclass that, jlong func)
 {
 	willPerformClientRedirectToURL_CALLBACK = func;
-	return (jintLong)willPerformClientRedirectToURL;
+	return (jlong)willPerformClientRedirectToURL;
 }
 #endif
 
 #ifndef NO_JSObjectCallAsFunctionProc_1CALLBACK
-static jintLong JSObjectCallAsFunctionProc_CALLBACK;
+static jlong JSObjectCallAsFunctionProc_CALLBACK;
 static JSValueRef JSObjectCallAsFunctionProc(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
 	return ((JSValueRef (CALLBACK *)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef*))JSObjectCallAsFunctionProc_CALLBACK)(ctx, function, thisObject, argumentCount, arguments, exception);
 }
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectCallAsFunctionProc_1CALLBACK) (JNIEnv *env, jclass that, jintLong func);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectCallAsFunctionProc_1CALLBACK) (JNIEnv *env, jclass that, jintLong func)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectCallAsFunctionProc_1CALLBACK) (JNIEnv *env, jclass that, jlong func);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectCallAsFunctionProc_1CALLBACK) (JNIEnv *env, jclass that, jlong func)
 {
 	JSObjectCallAsFunctionProc_CALLBACK = func;
-	return (jintLong)JSObjectCallAsFunctionProc;
+	return (jlong)JSObjectCallAsFunctionProc;
 }
 #endif
 
 #ifndef NO_JSObjectGetPropertyProc_1CALLBACK
-static jintLong JSObjectGetPropertyProc_CALLBACK;
+static jlong JSObjectGetPropertyProc_CALLBACK;
 static JSValueRef JSObjectGetPropertyProc(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
 {
 	return ((JSValueRef (CALLBACK *)(JSContextRef, JSObjectRef, JSStringRef, JSValueRef*))JSObjectGetPropertyProc_CALLBACK)(ctx, object, propertyName, exception);
 }
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetPropertyProc_1CALLBACK) (JNIEnv *env, jclass that, jintLong func);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectGetPropertyProc_1CALLBACK) (JNIEnv *env, jclass that, jintLong func)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetPropertyProc_1CALLBACK) (JNIEnv *env, jclass that, jlong func);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectGetPropertyProc_1CALLBACK) (JNIEnv *env, jclass that, jlong func)
 {
 	JSObjectGetPropertyProc_CALLBACK = func;
-	return (jintLong)JSObjectGetPropertyProc;
+	return (jlong)JSObjectGetPropertyProc;
 }
 #endif
 
 #ifndef NO_JSObjectHasPropertyProc_1CALLBACK
-static jintLong JSObjectHasPropertyProc_CALLBACK;
+static jlong JSObjectHasPropertyProc_CALLBACK;
 static bool JSObjectHasPropertyProc(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName)
 {
 	return ((bool (CALLBACK *)(JSContextRef, JSObjectRef, JSStringRef))JSObjectHasPropertyProc_CALLBACK)(ctx, object, propertyName);
 }
-extern "C" JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectHasPropertyProc_1CALLBACK) (JNIEnv *env, jclass that, jintLong func);
-JNIEXPORT jintLong JNICALL WebKit_win32_NATIVE(JSObjectHasPropertyProc_1CALLBACK) (JNIEnv *env, jclass that, jintLong func)
+extern "C" JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectHasPropertyProc_1CALLBACK) (JNIEnv *env, jclass that, jlong func);
+JNIEXPORT jlong JNICALL WebKit_win32_NATIVE(JSObjectHasPropertyProc_1CALLBACK) (JNIEnv *env, jclass that, jlong func)
 {
 	JSObjectHasPropertyProc_CALLBACK = func;
-	return (jintLong)JSObjectHasPropertyProc;
+	return (jlong)JSObjectHasPropertyProc;
 }
 #endif
 
 #ifndef NO_WebKitCreateInstance
-extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(WebKitCreateInstance)(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jbyteArray arg2, jintLongArray arg3);
+extern "C" JNIEXPORT jint JNICALL WebKit_win32_NATIVE(WebKitCreateInstance)(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jbyteArray arg2, jlongArray arg3);
 JNIEXPORT jint JNICALL WebKit_win32_NATIVE(WebKitCreateInstance)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1, jbyteArray arg2, jintLongArray arg3)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jbyteArray arg2, jlongArray arg3)
 {
 	jbyte *lparg0=NULL;
 	jbyte *lparg2=NULL;
-	jintLong *lparg3=NULL;
+	jlong *lparg3=NULL;
 	jint rc = 0;
 	WebKit_win32_NATIVE_ENTER(env, that, WebKitCreateInstance_FUNC);
 	if (arg0) if ((lparg0 = env->GetByteArrayElements(arg0, NULL)) == NULL) goto fail;
@@ -93,7 +93,7 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(WebKitCreateInstance)
 	{
 		WebKit_LOAD_FUNCTION(fp, WebKitCreateInstance)
 		if (fp) {
-			rc = (jint)((jint (*)(jbyte *, jintLong, jbyte *, jintLong *))fp)(lparg0, arg1, lparg2, lparg3);
+			rc = (jint)((jint (*)(jbyte *, jlong, jbyte *, jlong *))fp)(lparg0, arg1, lparg2, lparg3);
 		}
 	}
 fail:
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c
index 87b46e9caf..ffd0f9dab2 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.c	
@@ -47,18 +47,7 @@ static int counter = 0;
 #define ATOMIC_DEC(value) value--;
 #endif
 
-jintLong callback(int index, ...);
-
-#ifdef USE_ASSEMBLER
-
-#if !(defined (_WIN32) || defined (_WIN32_WCE))
-#include <sys/mman.h>
-#endif
-
-static unsigned char *callbackCode = NULL;
-#define CALLBACK_THUNK_SIZE 64
-
-#else
+jlong callback(int index, ...);
 
 /* --------------- callback functions --------------- */
 
@@ -74,43 +63,43 @@ static unsigned char *callbackCode = NULL;
  */
 
 /* Function template with no arguments */
-#define FN_0(index) RETURN_TYPE FN(index, 0)() { return RETURN_CAST callback(index); }
+#define FN_0(index) jlong FN(index, 0)() { return callback(index); }
 
 /* Function template with 1 argument */
-#define FN_1(index) RETURN_TYPE FN(index, 1)(jintLong p1) { return RETURN_CAST callback(index, p1); }
+#define FN_1(index) jlong FN(index, 1)(jlong p1) { return callback(index, p1); }
 
 /* Function template with 2 arguments */
-#define FN_2(index) RETURN_TYPE FN(index, 2)(jintLong p1, jintLong p2) { return RETURN_CAST callback(index, p1, p2); }
+#define FN_2(index) jlong FN(index, 2)(jlong p1, jlong p2) { return callback(index, p1, p2); }
 
 /* Function template with 3 arguments */
-#define FN_3(index) RETURN_TYPE FN(index, 3)(jintLong p1, jintLong p2, jintLong p3) { return RETURN_CAST callback(index, p1, p2, p3); }
+#define FN_3(index) jlong FN(index, 3)(jlong p1, jlong p2, jlong p3) { return callback(index, p1, p2, p3); }
 
 /* Function template with 4 arguments */
-#define FN_4(index) RETURN_TYPE FN(index, 4)(jintLong p1, jintLong p2, jintLong p3, jintLong p4) { return RETURN_CAST callback(index, p1, p2, p3, p4); }
+#define FN_4(index) jlong FN(index, 4)(jlong p1, jlong p2, jlong p3, jlong p4) { return callback(index, p1, p2, p3, p4); }
 
 /* Function template with 5 arguments */
-#define FN_5(index) RETURN_TYPE FN(index, 5)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5); }
+#define FN_5(index) jlong FN(index, 5)(jlong p1, jlong p2, jlong p3, jlong p4, jlong p5) { return callback(index, p1, p2, p3, p4, p5); }
 
 /* Function template with 6 arguments */
-#define FN_6(index) RETURN_TYPE FN(index, 6)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6); }
+#define FN_6(index) jlong FN(index, 6)(jlong p1, jlong p2, jlong p3, jlong p4, jlong p5, jlong p6) { return callback(index, p1, p2, p3, p4, p5, p6); }
 
 /* Function template with 7 arguments */
-#define FN_7(index) RETURN_TYPE FN(index, 7)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7); }
+#define FN_7(index) jlong FN(index, 7)(jlong p1, jlong p2, jlong p3, jlong p4, jlong p5, jlong p6, jlong p7) { return callback(index, p1, p2, p3, p4, p5, p6, p7); }
 
 /* Function template with 8 arguments */
-#define FN_8(index) RETURN_TYPE FN(index, 8)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8); }
+#define FN_8(index) jlong FN(index, 8)(jlong p1, jlong p2, jlong p3, jlong p4, jlong p5, jlong p6, jlong p7, jlong p8) { return callback(index, p1, p2, p3, p4, p5, p6, p7, p8); }
 
 /* Function template with 9 arguments */
-#define FN_9(index) RETURN_TYPE FN(index, 9)(jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8, jintLong p9) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9); }
+#define FN_9(index) jlong FN(index, 9)(jlong p1, jlong p2, jlong p3, jlong p4, jlong p5, jlong p6, jlong p7, jlong p8, jlong p9) { return callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9); }
 
 /* Function template with 10 arguments */
-#define FN_10(index) RETURN_TYPE FN(index, 10) (jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8, jintLong p9, jintLong p10) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); }
+#define FN_10(index) jlong FN(index, 10) (jlong p1, jlong p2, jlong p3, jlong p4, jlong p5, jlong p6, jlong p7, jlong p8, jlong p9, jlong p10) { return callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); }
 
 /* Function template with 11 arguments */
-#define FN_11(index) RETURN_TYPE FN(index, 11) (jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8, jintLong p9, jintLong p10, jintLong p11) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); }
+#define FN_11(index) jlong FN(index, 11) (jlong p1, jlong p2, jlong p3, jlong p4, jlong p5, jlong p6, jlong p7, jlong p8, jlong p9, jlong p10, jlong p11) { return callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); }
 
 /* Function template with 12 arguments */
-#define FN_12(index) RETURN_TYPE FN(index, 12) (jintLong p1, jintLong p2, jintLong p3, jintLong p4, jintLong p5, jintLong p6, jintLong p7, jintLong p8, jintLong p9, jintLong p10, jintLong p11, jintLong p12) { return RETURN_CAST callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); }
+#define FN_12(index) jlong FN(index, 12) (jlong p1, jlong p2, jlong p3, jlong p4, jlong p5, jlong p6, jlong p7, jlong p8, jlong p9, jlong p10, jlong p11, jlong p12) { return callback(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); }
 
 /**
  * Define all functions with the specified number of arguments.
@@ -555,418 +544,418 @@ FN_BLOCK(12)
  */
 #if MAX_CALLBACKS == 16
 #define FN_A_BLOCK(args) { \
-	(jintLong)FN(0, args), \
-	(jintLong)FN(1, args), \
-	(jintLong)FN(2, args), \
-	(jintLong)FN(3, args), \
-	(jintLong)FN(4, args), \
-	(jintLong)FN(5, args), \
-	(jintLong)FN(6, args), \
-	(jintLong)FN(7, args), \
-	(jintLong)FN(8, args), \
-	(jintLong)FN(9, args), \
-	(jintLong)FN(10, args), \
-	(jintLong)FN(11, args), \
-	(jintLong)FN(12, args), \
-	(jintLong)FN(13, args), \
-	(jintLong)FN(14, args), \
-	(jintLong)FN(15, args), \
+	(jlong)FN(0, args), \
+	(jlong)FN(1, args), \
+	(jlong)FN(2, args), \
+	(jlong)FN(3, args), \
+	(jlong)FN(4, args), \
+	(jlong)FN(5, args), \
+	(jlong)FN(6, args), \
+	(jlong)FN(7, args), \
+	(jlong)FN(8, args), \
+	(jlong)FN(9, args), \
+	(jlong)FN(10, args), \
+	(jlong)FN(11, args), \
+	(jlong)FN(12, args), \
+	(jlong)FN(13, args), \
+	(jlong)FN(14, args), \
+	(jlong)FN(15, args), \
 },
 #elif MAX_CALLBACKS == 128
 #define FN_A_BLOCK(args) { \
-	(jintLong)FN(0, args), \
-	(jintLong)FN(1, args), \
-	(jintLong)FN(2, args), \
-	(jintLong)FN(3, args), \
-	(jintLong)FN(4, args), \
-	(jintLong)FN(5, args), \
-	(jintLong)FN(6, args), \
-	(jintLong)FN(7, args), \
-	(jintLong)FN(8, args), \
-	(jintLong)FN(9, args), \
-	(jintLong)FN(10, args), \
-	(jintLong)FN(11, args), \
-	(jintLong)FN(12, args), \
-	(jintLong)FN(13, args), \
-	(jintLong)FN(14, args), \
-	(jintLong)FN(15, args), \
-	(jintLong)FN(16, args), \
-	(jintLong)FN(17, args), \
-	(jintLong)FN(18, args), \
-	(jintLong)FN(19, args), \
-	(jintLong)FN(20, args), \
-	(jintLong)FN(21, args), \
-	(jintLong)FN(22, args), \
-	(jintLong)FN(23, args), \
-	(jintLong)FN(24, args), \
-	(jintLong)FN(25, args), \
-	(jintLong)FN(26, args), \
-	(jintLong)FN(27, args), \
-	(jintLong)FN(28, args), \
-	(jintLong)FN(29, args), \
-	(jintLong)FN(30, args), \
-	(jintLong)FN(31, args), \
-	(jintLong)FN(32, args), \
-	(jintLong)FN(33, args), \
-	(jintLong)FN(34, args), \
-	(jintLong)FN(35, args), \
-	(jintLong)FN(36, args), \
-	(jintLong)FN(37, args), \
-	(jintLong)FN(38, args), \
-	(jintLong)FN(39, args), \
-	(jintLong)FN(40, args), \
-	(jintLong)FN(41, args), \
-	(jintLong)FN(42, args), \
-	(jintLong)FN(43, args), \
-	(jintLong)FN(44, args), \
-	(jintLong)FN(45, args), \
-	(jintLong)FN(46, args), \
-	(jintLong)FN(47, args), \
-	(jintLong)FN(48, args), \
-	(jintLong)FN(49, args), \
-	(jintLong)FN(50, args), \
-	(jintLong)FN(51, args), \
-	(jintLong)FN(52, args), \
-	(jintLong)FN(53, args), \
-	(jintLong)FN(54, args), \
-	(jintLong)FN(55, args), \
-	(jintLong)FN(56, args), \
-	(jintLong)FN(57, args), \
-	(jintLong)FN(58, args), \
-	(jintLong)FN(59, args), \
-	(jintLong)FN(60, args), \
-	(jintLong)FN(61, args), \
-	(jintLong)FN(62, args), \
-	(jintLong)FN(63, args), \
-	(jintLong)FN(64, args), \
-	(jintLong)FN(65, args), \
-	(jintLong)FN(66, args), \
-	(jintLong)FN(67, args), \
-	(jintLong)FN(68, args), \
-	(jintLong)FN(69, args), \
-	(jintLong)FN(70, args), \
-	(jintLong)FN(71, args), \
-	(jintLong)FN(72, args), \
-	(jintLong)FN(73, args), \
-	(jintLong)FN(74, args), \
-	(jintLong)FN(75, args), \
-	(jintLong)FN(76, args), \
-	(jintLong)FN(77, args), \
-	(jintLong)FN(78, args), \
-	(jintLong)FN(79, args), \
-	(jintLong)FN(80, args), \
-	(jintLong)FN(81, args), \
-	(jintLong)FN(82, args), \
-	(jintLong)FN(83, args), \
-	(jintLong)FN(84, args), \
-	(jintLong)FN(85, args), \
-	(jintLong)FN(86, args), \
-	(jintLong)FN(87, args), \
-	(jintLong)FN(88, args), \
-	(jintLong)FN(89, args), \
-	(jintLong)FN(90, args), \
-	(jintLong)FN(91, args), \
-	(jintLong)FN(92, args), \
-	(jintLong)FN(93, args), \
-	(jintLong)FN(94, args), \
-	(jintLong)FN(95, args), \
-	(jintLong)FN(96, args), \
-	(jintLong)FN(97, args), \
-	(jintLong)FN(98, args), \
-	(jintLong)FN(99, args), \
-	(jintLong)FN(100, args), \
-	(jintLong)FN(101, args), \
-	(jintLong)FN(102, args), \
-	(jintLong)FN(103, args), \
-	(jintLong)FN(104, args), \
-	(jintLong)FN(105, args), \
-	(jintLong)FN(106, args), \
-	(jintLong)FN(107, args), \
-	(jintLong)FN(108, args), \
-	(jintLong)FN(109, args), \
-	(jintLong)FN(110, args), \
-	(jintLong)FN(111, args), \
-	(jintLong)FN(112, args), \
-	(jintLong)FN(113, args), \
-	(jintLong)FN(114, args), \
-	(jintLong)FN(115, args), \
-	(jintLong)FN(116, args), \
-	(jintLong)FN(117, args), \
-	(jintLong)FN(118, args), \
-	(jintLong)FN(119, args), \
-	(jintLong)FN(120, args), \
-	(jintLong)FN(121, args), \
-	(jintLong)FN(122, args), \
-	(jintLong)FN(123, args), \
-	(jintLong)FN(124, args), \
-	(jintLong)FN(125, args), \
-	(jintLong)FN(126, args), \
-	(jintLong)FN(127, args), \
+	(jlong)FN(0, args), \
+	(jlong)FN(1, args), \
+	(jlong)FN(2, args), \
+	(jlong)FN(3, args), \
+	(jlong)FN(4, args), \
+	(jlong)FN(5, args), \
+	(jlong)FN(6, args), \
+	(jlong)FN(7, args), \
+	(jlong)FN(8, args), \
+	(jlong)FN(9, args), \
+	(jlong)FN(10, args), \
+	(jlong)FN(11, args), \
+	(jlong)FN(12, args), \
+	(jlong)FN(13, args), \
+	(jlong)FN(14, args), \
+	(jlong)FN(15, args), \
+	(jlong)FN(16, args), \
+	(jlong)FN(17, args), \
+	(jlong)FN(18, args), \
+	(jlong)FN(19, args), \
+	(jlong)FN(20, args), \
+	(jlong)FN(21, args), \
+	(jlong)FN(22, args), \
+	(jlong)FN(23, args), \
+	(jlong)FN(24, args), \
+	(jlong)FN(25, args), \
+	(jlong)FN(26, args), \
+	(jlong)FN(27, args), \
+	(jlong)FN(28, args), \
+	(jlong)FN(29, args), \
+	(jlong)FN(30, args), \
+	(jlong)FN(31, args), \
+	(jlong)FN(32, args), \
+	(jlong)FN(33, args), \
+	(jlong)FN(34, args), \
+	(jlong)FN(35, args), \
+	(jlong)FN(36, args), \
+	(jlong)FN(37, args), \
+	(jlong)FN(38, args), \
+	(jlong)FN(39, args), \
+	(jlong)FN(40, args), \
+	(jlong)FN(41, args), \
+	(jlong)FN(42, args), \
+	(jlong)FN(43, args), \
+	(jlong)FN(44, args), \
+	(jlong)FN(45, args), \
+	(jlong)FN(46, args), \
+	(jlong)FN(47, args), \
+	(jlong)FN(48, args), \
+	(jlong)FN(49, args), \
+	(jlong)FN(50, args), \
+	(jlong)FN(51, args), \
+	(jlong)FN(52, args), \
+	(jlong)FN(53, args), \
+	(jlong)FN(54, args), \
+	(jlong)FN(55, args), \
+	(jlong)FN(56, args), \
+	(jlong)FN(57, args), \
+	(jlong)FN(58, args), \
+	(jlong)FN(59, args), \
+	(jlong)FN(60, args), \
+	(jlong)FN(61, args), \
+	(jlong)FN(62, args), \
+	(jlong)FN(63, args), \
+	(jlong)FN(64, args), \
+	(jlong)FN(65, args), \
+	(jlong)FN(66, args), \
+	(jlong)FN(67, args), \
+	(jlong)FN(68, args), \
+	(jlong)FN(69, args), \
+	(jlong)FN(70, args), \
+	(jlong)FN(71, args), \
+	(jlong)FN(72, args), \
+	(jlong)FN(73, args), \
+	(jlong)FN(74, args), \
+	(jlong)FN(75, args), \
+	(jlong)FN(76, args), \
+	(jlong)FN(77, args), \
+	(jlong)FN(78, args), \
+	(jlong)FN(79, args), \
+	(jlong)FN(80, args), \
+	(jlong)FN(81, args), \
+	(jlong)FN(82, args), \
+	(jlong)FN(83, args), \
+	(jlong)FN(84, args), \
+	(jlong)FN(85, args), \
+	(jlong)FN(86, args), \
+	(jlong)FN(87, args), \
+	(jlong)FN(88, args), \
+	(jlong)FN(89, args), \
+	(jlong)FN(90, args), \
+	(jlong)FN(91, args), \
+	(jlong)FN(92, args), \
+	(jlong)FN(93, args), \
+	(jlong)FN(94, args), \
+	(jlong)FN(95, args), \
+	(jlong)FN(96, args), \
+	(jlong)FN(97, args), \
+	(jlong)FN(98, args), \
+	(jlong)FN(99, args), \
+	(jlong)FN(100, args), \
+	(jlong)FN(101, args), \
+	(jlong)FN(102, args), \
+	(jlong)FN(103, args), \
+	(jlong)FN(104, args), \
+	(jlong)FN(105, args), \
+	(jlong)FN(106, args), \
+	(jlong)FN(107, args), \
+	(jlong)FN(108, args), \
+	(jlong)FN(109, args), \
+	(jlong)FN(110, args), \
+	(jlong)FN(111, args), \
+	(jlong)FN(112, args), \
+	(jlong)FN(113, args), \
+	(jlong)FN(114, args), \
+	(jlong)FN(115, args), \
+	(jlong)FN(116, args), \
+	(jlong)FN(117, args), \
+	(jlong)FN(118, args), \
+	(jlong)FN(119, args), \
+	(jlong)FN(120, args), \
+	(jlong)FN(121, args), \
+	(jlong)FN(122, args), \
+	(jlong)FN(123, args), \
+	(jlong)FN(124, args), \
+	(jlong)FN(125, args), \
+	(jlong)FN(126, args), \
+	(jlong)FN(127, args), \
 },
 #elif MAX_CALLBACKS == 256
 #define FN_A_BLOCK(args) { \
-	(jintLong)FN(0, args), \
-	(jintLong)FN(1, args), \
-	(jintLong)FN(2, args), \
-	(jintLong)FN(3, args), \
-	(jintLong)FN(4, args), \
-	(jintLong)FN(5, args), \
-	(jintLong)FN(6, args), \
-	(jintLong)FN(7, args), \
-	(jintLong)FN(8, args), \
-	(jintLong)FN(9, args), \
-	(jintLong)FN(10, args), \
-	(jintLong)FN(11, args), \
-	(jintLong)FN(12, args), \
-	(jintLong)FN(13, args), \
-	(jintLong)FN(14, args), \
-	(jintLong)FN(15, args), \
-	(jintLong)FN(16, args), \
-	(jintLong)FN(17, args), \
-	(jintLong)FN(18, args), \
-	(jintLong)FN(19, args), \
-	(jintLong)FN(20, args), \
-	(jintLong)FN(21, args), \
-	(jintLong)FN(22, args), \
-	(jintLong)FN(23, args), \
-	(jintLong)FN(24, args), \
-	(jintLong)FN(25, args), \
-	(jintLong)FN(26, args), \
-	(jintLong)FN(27, args), \
-	(jintLong)FN(28, args), \
-	(jintLong)FN(29, args), \
-	(jintLong)FN(30, args), \
-	(jintLong)FN(31, args), \
-	(jintLong)FN(32, args), \
-	(jintLong)FN(33, args), \
-	(jintLong)FN(34, args), \
-	(jintLong)FN(35, args), \
-	(jintLong)FN(36, args), \
-	(jintLong)FN(37, args), \
-	(jintLong)FN(38, args), \
-	(jintLong)FN(39, args), \
-	(jintLong)FN(40, args), \
-	(jintLong)FN(41, args), \
-	(jintLong)FN(42, args), \
-	(jintLong)FN(43, args), \
-	(jintLong)FN(44, args), \
-	(jintLong)FN(45, args), \
-	(jintLong)FN(46, args), \
-	(jintLong)FN(47, args), \
-	(jintLong)FN(48, args), \
-	(jintLong)FN(49, args), \
-	(jintLong)FN(50, args), \
-	(jintLong)FN(51, args), \
-	(jintLong)FN(52, args), \
-	(jintLong)FN(53, args), \
-	(jintLong)FN(54, args), \
-	(jintLong)FN(55, args), \
-	(jintLong)FN(56, args), \
-	(jintLong)FN(57, args), \
-	(jintLong)FN(58, args), \
-	(jintLong)FN(59, args), \
-	(jintLong)FN(60, args), \
-	(jintLong)FN(61, args), \
-	(jintLong)FN(62, args), \
-	(jintLong)FN(63, args), \
-	(jintLong)FN(64, args), \
-	(jintLong)FN(65, args), \
-	(jintLong)FN(66, args), \
-	(jintLong)FN(67, args), \
-	(jintLong)FN(68, args), \
-	(jintLong)FN(69, args), \
-	(jintLong)FN(70, args), \
-	(jintLong)FN(71, args), \
-	(jintLong)FN(72, args), \
-	(jintLong)FN(73, args), \
-	(jintLong)FN(74, args), \
-	(jintLong)FN(75, args), \
-	(jintLong)FN(76, args), \
-	(jintLong)FN(77, args), \
-	(jintLong)FN(78, args), \
-	(jintLong)FN(79, args), \
-	(jintLong)FN(80, args), \
-	(jintLong)FN(81, args), \
-	(jintLong)FN(82, args), \
-	(jintLong)FN(83, args), \
-	(jintLong)FN(84, args), \
-	(jintLong)FN(85, args), \
-	(jintLong)FN(86, args), \
-	(jintLong)FN(87, args), \
-	(jintLong)FN(88, args), \
-	(jintLong)FN(89, args), \
-	(jintLong)FN(90, args), \
-	(jintLong)FN(91, args), \
-	(jintLong)FN(92, args), \
-	(jintLong)FN(93, args), \
-	(jintLong)FN(94, args), \
-	(jintLong)FN(95, args), \
-	(jintLong)FN(96, args), \
-	(jintLong)FN(97, args), \
-	(jintLong)FN(98, args), \
-	(jintLong)FN(99, args), \
-	(jintLong)FN(100, args), \
-	(jintLong)FN(101, args), \
-	(jintLong)FN(102, args), \
-	(jintLong)FN(103, args), \
-	(jintLong)FN(104, args), \
-	(jintLong)FN(105, args), \
-	(jintLong)FN(106, args), \
-	(jintLong)FN(107, args), \
-	(jintLong)FN(108, args), \
-	(jintLong)FN(109, args), \
-	(jintLong)FN(110, args), \
-	(jintLong)FN(111, args), \
-	(jintLong)FN(112, args), \
-	(jintLong)FN(113, args), \
-	(jintLong)FN(114, args), \
-	(jintLong)FN(115, args), \
-	(jintLong)FN(116, args), \
-	(jintLong)FN(117, args), \
-	(jintLong)FN(118, args), \
-	(jintLong)FN(119, args), \
-	(jintLong)FN(120, args), \
-	(jintLong)FN(121, args), \
-	(jintLong)FN(122, args), \
-	(jintLong)FN(123, args), \
-	(jintLong)FN(124, args), \
-	(jintLong)FN(125, args), \
-	(jintLong)FN(126, args), \
-	(jintLong)FN(127, args), \
-	(jintLong)FN(128, args), \
-	(jintLong)FN(129, args), \
-	(jintLong)FN(130, args), \
-	(jintLong)FN(131, args), \
-	(jintLong)FN(132, args), \
-	(jintLong)FN(133, args), \
-	(jintLong)FN(134, args), \
-	(jintLong)FN(135, args), \
-	(jintLong)FN(136, args), \
-	(jintLong)FN(137, args), \
-	(jintLong)FN(138, args), \
-	(jintLong)FN(139, args), \
-	(jintLong)FN(140, args), \
-	(jintLong)FN(141, args), \
-	(jintLong)FN(142, args), \
-	(jintLong)FN(143, args), \
-	(jintLong)FN(144, args), \
-	(jintLong)FN(145, args), \
-	(jintLong)FN(146, args), \
-	(jintLong)FN(147, args), \
-	(jintLong)FN(148, args), \
-	(jintLong)FN(149, args), \
-	(jintLong)FN(150, args), \
-	(jintLong)FN(151, args), \
-	(jintLong)FN(152, args), \
-	(jintLong)FN(153, args), \
-	(jintLong)FN(154, args), \
-	(jintLong)FN(155, args), \
-	(jintLong)FN(156, args), \
-	(jintLong)FN(157, args), \
-	(jintLong)FN(158, args), \
-	(jintLong)FN(159, args), \
-	(jintLong)FN(160, args), \
-	(jintLong)FN(161, args), \
-	(jintLong)FN(162, args), \
-	(jintLong)FN(163, args), \
-	(jintLong)FN(164, args), \
-	(jintLong)FN(165, args), \
-	(jintLong)FN(166, args), \
-	(jintLong)FN(167, args), \
-	(jintLong)FN(168, args), \
-	(jintLong)FN(169, args), \
-	(jintLong)FN(170, args), \
-	(jintLong)FN(171, args), \
-	(jintLong)FN(172, args), \
-	(jintLong)FN(173, args), \
-	(jintLong)FN(174, args), \
-	(jintLong)FN(175, args), \
-	(jintLong)FN(176, args), \
-	(jintLong)FN(177, args), \
-	(jintLong)FN(178, args), \
-	(jintLong)FN(179, args), \
-	(jintLong)FN(180, args), \
-	(jintLong)FN(181, args), \
-	(jintLong)FN(182, args), \
-	(jintLong)FN(183, args), \
-	(jintLong)FN(184, args), \
-	(jintLong)FN(185, args), \
-	(jintLong)FN(186, args), \
-	(jintLong)FN(187, args), \
-	(jintLong)FN(188, args), \
-	(jintLong)FN(189, args), \
-	(jintLong)FN(190, args), \
-	(jintLong)FN(191, args), \
-	(jintLong)FN(192, args), \
-	(jintLong)FN(193, args), \
-	(jintLong)FN(194, args), \
-	(jintLong)FN(195, args), \
-	(jintLong)FN(196, args), \
-	(jintLong)FN(197, args), \
-	(jintLong)FN(198, args), \
-	(jintLong)FN(199, args), \
-	(jintLong)FN(200, args), \
-	(jintLong)FN(201, args), \
-	(jintLong)FN(202, args), \
-	(jintLong)FN(203, args), \
-	(jintLong)FN(204, args), \
-	(jintLong)FN(205, args), \
-	(jintLong)FN(206, args), \
-	(jintLong)FN(207, args), \
-	(jintLong)FN(208, args), \
-	(jintLong)FN(209, args), \
-	(jintLong)FN(210, args), \
-	(jintLong)FN(211, args), \
-	(jintLong)FN(212, args), \
-	(jintLong)FN(213, args), \
-	(jintLong)FN(214, args), \
-	(jintLong)FN(215, args), \
-	(jintLong)FN(216, args), \
-	(jintLong)FN(217, args), \
-	(jintLong)FN(218, args), \
-	(jintLong)FN(219, args), \
-	(jintLong)FN(220, args), \
-	(jintLong)FN(221, args), \
-	(jintLong)FN(222, args), \
-	(jintLong)FN(223, args), \
-	(jintLong)FN(224, args), \
-	(jintLong)FN(225, args), \
-	(jintLong)FN(226, args), \
-	(jintLong)FN(227, args), \
-	(jintLong)FN(228, args), \
-	(jintLong)FN(229, args), \
-	(jintLong)FN(230, args), \
-	(jintLong)FN(231, args), \
-	(jintLong)FN(232, args), \
-	(jintLong)FN(233, args), \
-	(jintLong)FN(234, args), \
-	(jintLong)FN(235, args), \
-	(jintLong)FN(236, args), \
-	(jintLong)FN(237, args), \
-	(jintLong)FN(238, args), \
-	(jintLong)FN(239, args), \
-	(jintLong)FN(240, args), \
-	(jintLong)FN(241, args), \
-	(jintLong)FN(242, args), \
-	(jintLong)FN(243, args), \
-	(jintLong)FN(244, args), \
-	(jintLong)FN(245, args), \
-	(jintLong)FN(246, args), \
-	(jintLong)FN(247, args), \
-	(jintLong)FN(248, args), \
-	(jintLong)FN(249, args), \
-	(jintLong)FN(250, args), \
-	(jintLong)FN(251, args), \
-	(jintLong)FN(252, args), \
-	(jintLong)FN(253, args), \
-	(jintLong)FN(254, args), \
-	(jintLong)FN(255, args), \
+	(jlong)FN(0, args), \
+	(jlong)FN(1, args), \
+	(jlong)FN(2, args), \
+	(jlong)FN(3, args), \
+	(jlong)FN(4, args), \
+	(jlong)FN(5, args), \
+	(jlong)FN(6, args), \
+	(jlong)FN(7, args), \
+	(jlong)FN(8, args), \
+	(jlong)FN(9, args), \
+	(jlong)FN(10, args), \
+	(jlong)FN(11, args), \
+	(jlong)FN(12, args), \
+	(jlong)FN(13, args), \
+	(jlong)FN(14, args), \
+	(jlong)FN(15, args), \
+	(jlong)FN(16, args), \
+	(jlong)FN(17, args), \
+	(jlong)FN(18, args), \
+	(jlong)FN(19, args), \
+	(jlong)FN(20, args), \
+	(jlong)FN(21, args), \
+	(jlong)FN(22, args), \
+	(jlong)FN(23, args), \
+	(jlong)FN(24, args), \
+	(jlong)FN(25, args), \
+	(jlong)FN(26, args), \
+	(jlong)FN(27, args), \
+	(jlong)FN(28, args), \
+	(jlong)FN(29, args), \
+	(jlong)FN(30, args), \
+	(jlong)FN(31, args), \
+	(jlong)FN(32, args), \
+	(jlong)FN(33, args), \
+	(jlong)FN(34, args), \
+	(jlong)FN(35, args), \
+	(jlong)FN(36, args), \
+	(jlong)FN(37, args), \
+	(jlong)FN(38, args), \
+	(jlong)FN(39, args), \
+	(jlong)FN(40, args), \
+	(jlong)FN(41, args), \
+	(jlong)FN(42, args), \
+	(jlong)FN(43, args), \
+	(jlong)FN(44, args), \
+	(jlong)FN(45, args), \
+	(jlong)FN(46, args), \
+	(jlong)FN(47, args), \
+	(jlong)FN(48, args), \
+	(jlong)FN(49, args), \
+	(jlong)FN(50, args), \
+	(jlong)FN(51, args), \
+	(jlong)FN(52, args), \
+	(jlong)FN(53, args), \
+	(jlong)FN(54, args), \
+	(jlong)FN(55, args), \
+	(jlong)FN(56, args), \
+	(jlong)FN(57, args), \
+	(jlong)FN(58, args), \
+	(jlong)FN(59, args), \
+	(jlong)FN(60, args), \
+	(jlong)FN(61, args), \
+	(jlong)FN(62, args), \
+	(jlong)FN(63, args), \
+	(jlong)FN(64, args), \
+	(jlong)FN(65, args), \
+	(jlong)FN(66, args), \
+	(jlong)FN(67, args), \
+	(jlong)FN(68, args), \
+	(jlong)FN(69, args), \
+	(jlong)FN(70, args), \
+	(jlong)FN(71, args), \
+	(jlong)FN(72, args), \
+	(jlong)FN(73, args), \
+	(jlong)FN(74, args), \
+	(jlong)FN(75, args), \
+	(jlong)FN(76, args), \
+	(jlong)FN(77, args), \
+	(jlong)FN(78, args), \
+	(jlong)FN(79, args), \
+	(jlong)FN(80, args), \
+	(jlong)FN(81, args), \
+	(jlong)FN(82, args), \
+	(jlong)FN(83, args), \
+	(jlong)FN(84, args), \
+	(jlong)FN(85, args), \
+	(jlong)FN(86, args), \
+	(jlong)FN(87, args), \
+	(jlong)FN(88, args), \
+	(jlong)FN(89, args), \
+	(jlong)FN(90, args), \
+	(jlong)FN(91, args), \
+	(jlong)FN(92, args), \
+	(jlong)FN(93, args), \
+	(jlong)FN(94, args), \
+	(jlong)FN(95, args), \
+	(jlong)FN(96, args), \
+	(jlong)FN(97, args), \
+	(jlong)FN(98, args), \
+	(jlong)FN(99, args), \
+	(jlong)FN(100, args), \
+	(jlong)FN(101, args), \
+	(jlong)FN(102, args), \
+	(jlong)FN(103, args), \
+	(jlong)FN(104, args), \
+	(jlong)FN(105, args), \
+	(jlong)FN(106, args), \
+	(jlong)FN(107, args), \
+	(jlong)FN(108, args), \
+	(jlong)FN(109, args), \
+	(jlong)FN(110, args), \
+	(jlong)FN(111, args), \
+	(jlong)FN(112, args), \
+	(jlong)FN(113, args), \
+	(jlong)FN(114, args), \
+	(jlong)FN(115, args), \
+	(jlong)FN(116, args), \
+	(jlong)FN(117, args), \
+	(jlong)FN(118, args), \
+	(jlong)FN(119, args), \
+	(jlong)FN(120, args), \
+	(jlong)FN(121, args), \
+	(jlong)FN(122, args), \
+	(jlong)FN(123, args), \
+	(jlong)FN(124, args), \
+	(jlong)FN(125, args), \
+	(jlong)FN(126, args), \
+	(jlong)FN(127, args), \
+	(jlong)FN(128, args), \
+	(jlong)FN(129, args), \
+	(jlong)FN(130, args), \
+	(jlong)FN(131, args), \
+	(jlong)FN(132, args), \
+	(jlong)FN(133, args), \
+	(jlong)FN(134, args), \
+	(jlong)FN(135, args), \
+	(jlong)FN(136, args), \
+	(jlong)FN(137, args), \
+	(jlong)FN(138, args), \
+	(jlong)FN(139, args), \
+	(jlong)FN(140, args), \
+	(jlong)FN(141, args), \
+	(jlong)FN(142, args), \
+	(jlong)FN(143, args), \
+	(jlong)FN(144, args), \
+	(jlong)FN(145, args), \
+	(jlong)FN(146, args), \
+	(jlong)FN(147, args), \
+	(jlong)FN(148, args), \
+	(jlong)FN(149, args), \
+	(jlong)FN(150, args), \
+	(jlong)FN(151, args), \
+	(jlong)FN(152, args), \
+	(jlong)FN(153, args), \
+	(jlong)FN(154, args), \
+	(jlong)FN(155, args), \
+	(jlong)FN(156, args), \
+	(jlong)FN(157, args), \
+	(jlong)FN(158, args), \
+	(jlong)FN(159, args), \
+	(jlong)FN(160, args), \
+	(jlong)FN(161, args), \
+	(jlong)FN(162, args), \
+	(jlong)FN(163, args), \
+	(jlong)FN(164, args), \
+	(jlong)FN(165, args), \
+	(jlong)FN(166, args), \
+	(jlong)FN(167, args), \
+	(jlong)FN(168, args), \
+	(jlong)FN(169, args), \
+	(jlong)FN(170, args), \
+	(jlong)FN(171, args), \
+	(jlong)FN(172, args), \
+	(jlong)FN(173, args), \
+	(jlong)FN(174, args), \
+	(jlong)FN(175, args), \
+	(jlong)FN(176, args), \
+	(jlong)FN(177, args), \
+	(jlong)FN(178, args), \
+	(jlong)FN(179, args), \
+	(jlong)FN(180, args), \
+	(jlong)FN(181, args), \
+	(jlong)FN(182, args), \
+	(jlong)FN(183, args), \
+	(jlong)FN(184, args), \
+	(jlong)FN(185, args), \
+	(jlong)FN(186, args), \
+	(jlong)FN(187, args), \
+	(jlong)FN(188, args), \
+	(jlong)FN(189, args), \
+	(jlong)FN(190, args), \
+	(jlong)FN(191, args), \
+	(jlong)FN(192, args), \
+	(jlong)FN(193, args), \
+	(jlong)FN(194, args), \
+	(jlong)FN(195, args), \
+	(jlong)FN(196, args), \
+	(jlong)FN(197, args), \
+	(jlong)FN(198, args), \
+	(jlong)FN(199, args), \
+	(jlong)FN(200, args), \
+	(jlong)FN(201, args), \
+	(jlong)FN(202, args), \
+	(jlong)FN(203, args), \
+	(jlong)FN(204, args), \
+	(jlong)FN(205, args), \
+	(jlong)FN(206, args), \
+	(jlong)FN(207, args), \
+	(jlong)FN(208, args), \
+	(jlong)FN(209, args), \
+	(jlong)FN(210, args), \
+	(jlong)FN(211, args), \
+	(jlong)FN(212, args), \
+	(jlong)FN(213, args), \
+	(jlong)FN(214, args), \
+	(jlong)FN(215, args), \
+	(jlong)FN(216, args), \
+	(jlong)FN(217, args), \
+	(jlong)FN(218, args), \
+	(jlong)FN(219, args), \
+	(jlong)FN(220, args), \
+	(jlong)FN(221, args), \
+	(jlong)FN(222, args), \
+	(jlong)FN(223, args), \
+	(jlong)FN(224, args), \
+	(jlong)FN(225, args), \
+	(jlong)FN(226, args), \
+	(jlong)FN(227, args), \
+	(jlong)FN(228, args), \
+	(jlong)FN(229, args), \
+	(jlong)FN(230, args), \
+	(jlong)FN(231, args), \
+	(jlong)FN(232, args), \
+	(jlong)FN(233, args), \
+	(jlong)FN(234, args), \
+	(jlong)FN(235, args), \
+	(jlong)FN(236, args), \
+	(jlong)FN(237, args), \
+	(jlong)FN(238, args), \
+	(jlong)FN(239, args), \
+	(jlong)FN(240, args), \
+	(jlong)FN(241, args), \
+	(jlong)FN(242, args), \
+	(jlong)FN(243, args), \
+	(jlong)FN(244, args), \
+	(jlong)FN(245, args), \
+	(jlong)FN(246, args), \
+	(jlong)FN(247, args), \
+	(jlong)FN(248, args), \
+	(jlong)FN(249, args), \
+	(jlong)FN(250, args), \
+	(jlong)FN(251, args), \
+	(jlong)FN(252, args), \
+	(jlong)FN(253, args), \
+	(jlong)FN(254, args), \
+	(jlong)FN(255, args), \
 },
 #else
 #error Invalid MAX_CALLBACKS
 #endif /* MAX_CALLBACKS == 16 */
 
-jintLong fnx_array[MAX_ARGS+1][MAX_CALLBACKS] = { 
+jlong fnx_array[MAX_ARGS+1][MAX_CALLBACKS] = {
 	FN_A_BLOCK(0)    
 	FN_A_BLOCK(1)    
 	FN_A_BLOCK(2)    
@@ -982,12 +971,10 @@ jintLong fnx_array[MAX_ARGS+1][MAX_CALLBACKS] = {
 	FN_A_BLOCK(12)    
 };
 
-#endif /* USE_ASSEMBLER */
-
 /* --------------- callback class calls --------------- */
 
-JNIEXPORT jintLong JNICALL CALLBACK_NATIVE(bind)
-  (JNIEnv *env, jclass that, jobject callbackObject, jobject object, jstring method, jstring signature, jint argCount, jboolean isStatic, jboolean isArrayBased, jintLong errorResult)
+JNIEXPORT jlong JNICALL CALLBACK_NATIVE(bind)
+  (JNIEnv *env, jclass that, jobject callbackObject, jobject object, jstring method, jstring signature, jint argCount, jboolean isStatic, jboolean isArrayBased, jlong errorResult)
 {
 	int i;
 	jmethodID mid = NULL;
@@ -1021,105 +1008,7 @@ JNIEXPORT jintLong JNICALL CALLBACK_NATIVE(bind)
 			callbackData[i].argCount = argCount;
 			callbackData[i].errorResult = errorResult;
 			callbackData[i].methodID = mid;
-#ifndef USE_ASSEMBLER
-			return (jintLong) fnx_array[argCount][i];
-#else
-			{
-			int j = 0, k;
-			unsigned char* code;
-#ifdef __APPLE__
-			int pad = 0;
-#endif
-			if (callbackCode == NULL) {
-#if defined (_WIN32) || defined (_WIN32_WCE)
-				callbackCode = VirtualAlloc(NULL, CALLBACK_THUNK_SIZE * MAX_CALLBACKS, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-				if (callbackCode == NULL) return 0;
-#else 
-				callbackCode = mmap(NULL, CALLBACK_THUNK_SIZE * MAX_CALLBACKS, PROT_EXEC | PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-				if (callbackCode == MAP_FAILED) return 0;
-#endif
-			}
-			code = (unsigned char *)(callbackCode + (i * CALLBACK_THUNK_SIZE));
-
-			//PUSH EBP - 1 byte
-			code[j++] = 0x55;
-
-			//MOV EBP,ESP - 2 bytes
-			code[j++] = 0x8b;
-			code[j++] = 0xec;
-
-#ifdef __APPLE__
-			/* darwin calling conventions require that the stack be aligned on a 16-byte boundary. */
-			k = (argCount+3)*sizeof(jintLong);
-			pad = ((k + 15) & ~15) - k;
-			if (pad > 0) {
-				//SUB ESP,pad - 3 bytes
-				code[j++] = 0x83;
-				code[j++] = 0xec;
-				code[j++] = pad;
-			}
-#endif
-
-			// 3*argCount bytes
-			for (k=(argCount + 1) * sizeof(jintLong); k >= sizeof(jintLong)*2; k -= sizeof(jintLong)) {
-				//PUSH SS:[EBP+k]
-				code[j++] = 0xff;
-				code[j++] = 0x75;
-				code[j++] = k;
-			}
-
-			if (i > 127) {
-				//PUSH i - 5 bytes
-				code[j++] = 0x68;
-				code[j++] = ((i >> 0) & 0xFF);
-				code[j++] = ((i >> 8) & 0xFF);
-				code[j++] = ((i >> 16) & 0xFF);
-				code[j++] = ((i >> 24) & 0xFF);
-			} else {
-				//PUSH i - 2 bytes
-				code[j++] = 0x6a;
-				code[j++] = i;
-			}
-
-			//MOV EAX callback - 1 + sizeof(jintLong) bytes
-			code[j++] = 0xb8;
-			((jintLong *)&code[j])[0] = (jintLong)&callback;
-			j += sizeof(jintLong);
-
-			//CALL EAX - 2 bytes
-			code[j++] = 0xff;
-			code[j++] = 0xd0;
-
-			//ADD ESP,(argCount + 1) * sizeof(jintLong) - 3 bytes
-			code[j++] = 0x83;
-			code[j++] = 0xc4;
-#ifdef __APPLE__
-			code[j++] = (unsigned char)(pad + ((argCount + 1) * sizeof(jintLong)));
-#else
-			code[j++] = (unsigned char)((argCount + 1) * sizeof(jintLong));
-#endif
-
-			//POP EBP - 1 byte
-			code[j++] = 0x5d;
-
-#if defined (_WIN32) || defined (_WIN32_WCE)
-			//RETN argCount * sizeof(jintLong) - 3 bytes
-			code[j++] = 0xc2;
-			code[j++] = (unsigned char)(argCount * sizeof(jintLong));
-			code[j++] = 0x00;
-#else
-			//RETN - 1 byte
-			code[j++] = 0xc3;
-#endif
-
-			if (j > CALLBACK_THUNK_SIZE) {
-				jclass errorClass = (*env)->FindClass(env, "java/lang/Error");
-				(*env)->ThrowNew(env, errorClass, "Callback thunk overflow");
-			}
-
-			return (jintLong)code;
-			}
-#endif /* USE_ASSEMBLER */
+			return (jlong) fnx_array[argCount][i];
 		}
 	}
 fail:
@@ -1163,7 +1052,7 @@ JNIEXPORT void JNICALL CALLBACK_NATIVE(reset)
     memset((void *)&callbackData, 0, sizeof(callbackData));
 }
 
-jintLong callback(int index, ...)
+jlong callback(int index, ...)
 {
 	if (!callbackEnabled) return 0;
 
@@ -1174,7 +1063,7 @@ jintLong callback(int index, ...)
 	jboolean isStatic = callbackData[index].isStatic;
 	jboolean isArrayBased = callbackData[index].isArrayBased;
 	jint argCount = callbackData[index].argCount;
-	jintLong result = callbackData[index].errorResult;
+	jlong result = callbackData[index].errorResult;
 	jthrowable ex;
 	int detach = 0;
 	va_list vl;
@@ -1221,18 +1110,18 @@ jintLong callback(int index, ...)
 	va_start(vl, index);
 	if (isArrayBased) {
 		int i;
-		jintLongArray argsArray = (*env)->NewIntLongArray(env, argCount);
+		jlongArray argsArray = (*env)->NewLongArray(env, argCount);
 		if (argsArray != NULL) {
-			jintLong *elements = (*env)->GetIntLongArrayElements(env, argsArray, NULL);
+			jlong *elements = (*env)->GetLongArrayElements(env, argsArray, NULL);
 			if (elements != NULL) {
 				for (i=0; i<argCount; i++) {
-					elements[i] = va_arg(vl, jintLong); 
+					elements[i] = va_arg(vl, jlong);
 				}
-				(*env)->ReleaseIntLongArrayElements(env, argsArray, elements, 0);
+				(*env)->ReleaseLongArrayElements(env, argsArray, elements, 0);
 				if (isStatic) {
-					result = (*env)->CallStaticIntLongMethod(env, object, mid, argsArray);
+					result = (*env)->CallStaticLongMethod(env, object, mid, argsArray);
 				} else {
-					result = (*env)->CallIntLongMethod(env, object, mid, argsArray);
+					result = (*env)->CallLongMethod(env, object, mid, argsArray);
 				}
 			}
 			/*
@@ -1243,9 +1132,9 @@ jintLong callback(int index, ...)
 		}
 	} else {
 		if (isStatic) {
-			result = (*env)->CallStaticIntLongMethodV(env, object, mid, vl);
+			result = (*env)->CallStaticLongMethodV(env, object, mid, vl);
 		} else {
-			result = (*env)->CallIntLongMethodV(env, object, mid, vl);
+			result = (*env)->CallLongMethodV(env, object, mid, vl);
 		}
 	}
 	va_end(vl);
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h
index a9bc844c73..df8ccf4fd6 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/callback.h	
@@ -20,31 +20,6 @@
 
 #include "swt.h"
 
-#if defined (_WIN32) || defined (_WIN32_WCE)
-#include "windows.h"
-#define RETURN_TYPE LRESULT CALLBACK
-#define RETURN_CAST (LRESULT)
-#endif
-
-#if defined COCOA
-#import <Foundation/Foundation.h>
-#endif
-
-#ifndef RETURN_TYPE
-#define RETURN_TYPE jintLong
-#endif
-
-#ifndef RETURN_CAST
-#define RETURN_CAST
-#endif
-
-/*
-* Note that only x86 assembler is supported
-*/
-#if !(defined(__i386__) || defined(_M_IX86) || defined(_X86_))
-#undef USE_ASSEMBLER
-#endif
-
 #ifdef REDUCED_CALLBACKS
 #define MAX_CALLBACKS 16
 #else
@@ -64,7 +39,7 @@ typedef struct CALLBACK_DATA {
 	jboolean isStatic;
 	jboolean isArrayBased; 
 	jint argCount;
-	jintLong errorResult;
+	jlong errorResult;
 } CALLBACK_DATA;
 
 #endif /* ifndef INC_callback_H */
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h
index 61122b8e36..42f3d3b9f7 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h	
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/common/library/swt.h	
@@ -44,74 +44,8 @@ extern int IS_JNI_1_2;
 #define CHECK_DLERROR
 #endif
 
-#ifndef JNI64
-#if __x86_64__
-#define JNI64
-#endif
-#endif
-
-/* 64 bit support */
-#ifndef JNI64
-
-/* int/long defines */
-#define GetIntLongField GetIntField
-#define SetIntLongField SetIntField
-#define GetIntLongArrayElements GetIntArrayElements
-#define ReleaseIntLongArrayElements ReleaseIntArrayElements
-#define GetIntLongArrayRegion GetIntArrayRegion
-#define SetIntLongArrayRegion SetIntArrayRegion
-#define NewIntLongArray NewIntArray
-#define CallStaticIntLongMethod CallStaticIntMethod
-#define CallIntLongMethod CallIntMethod
-#define CallStaticIntLongMethodV CallStaticIntMethodV
-#define CallIntLongMethodV CallIntMethodV
-#define jintLongArray jintArray
-#define jintLong jint
-#define I_J "I"
-#define I_JArray "[I"
-
-/* float/double defines */
-#define GetFloatDoubleField GetFloatField
-#define SetFloatDoubleField SetFloatField
-#define GetFloatDoubleArrayElements GetFloatArrayElements
-#define ReleaseFloatDoubleArrayElements ReleaseFloatArrayElements
-#define GetFloatDoubleArrayRegion GetFloatArrayRegion
-#define jfloatDoubleArray jfloatArray
-#define jfloatDouble jfloat
-#define F_D "F"
-#define F_DArray "[F"
-
-#else
-
-/* int/long defines */
-#define GetIntLongField GetLongField
-#define SetIntLongField SetLongField
-#define GetIntLongArrayElements GetLongArrayElements
-#define ReleaseIntLongArrayElements ReleaseLongArrayElements
-#define GetIntLongArrayRegion GetLongArrayRegion
-#define SetIntLongArrayRegion SetLongArrayRegion
-#define NewIntLongArray NewLongArray
-#define CallStaticIntLongMethod CallStaticLongMethod
-#define CallIntLongMethod CallLongMethod
-#define CallStaticIntLongMethodV CallStaticLongMethodV
-#define CallIntLongMethodV CallLongMethodV
-#define jintLongArray jlongArray
+/* For JNIGen */
 #define jintLong jlong
-#define I_J "J"
-#define I_JArray "[J"
-
-/* float/double defines */
-#define GetFloatDoubleField GetDoubleField
-#define SetFloatDoubleField SetDoubleField
-#define GetFloatDoubleArrayElements GetDoubleArrayElements
-#define ReleaseFloatDoubleArrayElements ReleaseDoubleArrayElements
-#define GetFloatDoubleArrayRegion GetDoubleArrayRegion
-#define jfloatDoubleArray jdoubleArray
-#define jfloatDouble jdouble
-#define F_D "D"
-#define F_DArray "[D"
-
-#endif
 
 #ifdef __APPLE__
 #define CALLING_CONVENTION
-- 
cgit v1.2.3