Bug 545793 - [GTK] Remove 32-bit code

Remove more /*int*/ casts.

Change-Id: I23076cf3cf9fc3fd87f59f7b36004016e41875ac
Signed-off-by: Xi Yan <xixiyan@redhat.com>

28 files changed, 379 insertions, 436 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
index 33254052f4..c4e3a71bf7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -941,7 +941,7 @@ class AccessibleObject {
 			int length = size(listeners);
 			if (length > 0) {
 				AccessibleTextEvent event = new AccessibleTextEvent(accessible);
-				event.index = (int)/*int*/link_index;
+				event.index = (int)link_index;
 				for (int i = 0; i < length; i++) {
 					AccessibleTextExtendedListener listener = listeners.get(i);
 					listener.getHyperlink(event);
@@ -1017,7 +1017,7 @@ class AccessibleObject {
 			int length = size(listeners);
 			if (length > 0) {
 				AccessibleTextEvent event = new AccessibleTextEvent(accessible);
-				event.offset = (int)/*int*/char_index;
+				event.offset = (int)char_index;
 				event.index = -1;
 				for (int i = 0; i < length; i++) {
 					AccessibleTextExtendedListener listener = listeners.get(i);
@@ -2327,7 +2327,7 @@ class AccessibleObject {
 				int count = event.selected != null ? event.selected.length : 0;
 				long result = OS.g_malloc(count * 4);
 				if (event.selected != null) C.memmove(result, event.selected, count * 4);
-				if (selected != 0) C.memmove(selected, new long /*int*/[]{result}, C.PTR_SIZEOF);
+				if (selected != 0) C.memmove(selected, new long []{result}, C.PTR_SIZEOF);
 				return count;
 			}
 		}
@@ -2369,7 +2369,7 @@ class AccessibleObject {
 				int count = event.selected != null ? event.selected.length : 0;
 				long result = OS.g_malloc(count * 4);
 				if (event.selected != null) C.memmove(result, event.selected, count * 4);
-				if (selected != 0) C.memmove(selected, new long /*int*/[]{result}, C.PTR_SIZEOF);
+				if (selected != 0) C.memmove(selected, new long []{result}, C.PTR_SIZEOF);
 				return count;
 			}
 		}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java
index 02e3fa0022..c95207eeef 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/FileTransfer.java
@@ -90,7 +90,7 @@ public void javaToNative(Object object, TransferData transferData) {
 		if (length == 0) continue;
 		char[] chars = new char[length];
 		string.getChars(0, length, chars, 0);
-		long /*int*/[] error = new long /*int*/[1];
+		long [] error = new long [1];
 		long utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error);
 		if (error[0] != 0 || utf8Ptr == 0) continue;
 		long localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error);
@@ -143,7 +143,7 @@ public Object nativeToJava(TransferData transferData) {
 	C.memmove(temp, transferData.pValue, length);
 	boolean gnomeList = transferData.type == GNOME_LIST_ID;
 	int sepLength = gnomeList ? 1 : 2;
-	long /*int*/[] files = new long /*int*/[0];
+	long [] files = new long [0];
 	int offset = 0;
 	for (int i = 0; i < temp.length - 1; i++) {
 		boolean terminator = gnomeList ? temp[i] == '\n' : temp[i] == '\r' && temp[i+1] == '\n';
@@ -155,7 +155,7 @@ public Object nativeToJava(TransferData transferData) {
 				byte[] fileBuffer = new byte[size + 1];
 				System.arraycopy(temp, offset, fileBuffer, 0, size);
 				C.memmove(file, fileBuffer, size + 1);
-				long /*int*/[] newFiles = new long /*int*/[files.length + 1];
+				long [] newFiles = new long [files.length + 1];
 				System.arraycopy(files, 0, newFiles, 0, files.length);
 				newFiles[files.length] = file;
 				files = newFiles;
@@ -169,14 +169,14 @@ public Object nativeToJava(TransferData transferData) {
 		byte[] fileBuffer = new byte[size + 1];
 		System.arraycopy(temp, offset, fileBuffer, 0, size);
 		C.memmove(file, fileBuffer, size + 1);
-		long /*int*/[] newFiles = new long /*int*/[files.length + 1];
+		long [] newFiles = new long [files.length + 1];
 		System.arraycopy(files, 0, newFiles, 0, files.length);
 		newFiles[files.length] = file;
 		files = newFiles;
 	}
 	String[] fileNames = new String[0];
 	for (int i = 0; i < files.length; i++) {
-		long /*int*/[] error = new long /*int*/[1];
+		long [] error = new long [1];
 		long localePtr = OS.g_filename_from_uri(files[i], null, error);
 		OS.g_free(files[i]);
 		if (error[0] != 0 || localePtr == 0) continue;
@@ -184,7 +184,7 @@ public Object nativeToJava(TransferData transferData) {
 		if (utf8Ptr == 0) utf8Ptr = OS.g_filename_display_name (localePtr);
 		if (localePtr != utf8Ptr) OS.g_free (localePtr);
 		if (utf8Ptr == 0) continue;
-		long /*int*/[] items_written = new long /*int*/[1];
+		long [] items_written = new long [1];
 		long utf16Ptr = OS.g_utf8_to_utf16(utf8Ptr, -1, null, items_written, null);
 		OS.g_free(utf8Ptr);
 		if (utf16Ptr == 0) continue;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java
index a78ce8bccf..1b152d4960 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TextTransfer.java
@@ -76,9 +76,9 @@ public void javaToNative (Object object, TransferData transferData) {
 	String string = (String)object;
 	byte[] utf8 = Converter.wcsToMbcs (string, true);
 	if  (OS.isX11() && transferData.type ==  COMPOUND_TEXT_ID) {
-		long /*int*/[] encoding = new long /*int*/[1];
+		long [] encoding = new long [1];
 		int[] format = new int[1];
-		long /*int*/[] ctext = new long /*int*/[1];
+		long [] ctext = new long [1];
 		int[] length = new int[1];
 		boolean result = GDK.gdk_x11_display_utf8_to_compound_text (GDK.gdk_display_get_default(), utf8, encoding, format, ctext, length);
 		if (!result) return;
@@ -121,10 +121,10 @@ public void javaToNative (Object object, TransferData transferData) {
 @Override
 public Object nativeToJava(TransferData transferData){
 	if (!isSupportedType(transferData) ||  transferData.pValue == 0) return null;
-	long /*int*/[] list = new long /*int*/[1];
+	long [] list = new long [1];
 	int count = GDK.gdk_text_property_to_utf8_list_for_display(GDK.gdk_display_get_default(), transferData.type, transferData.format, transferData.pValue, transferData.length, list);
 	if (count == 0) return null;
-	long /*int*/[] ptr = new long /*int*/[1];
+	long [] ptr = new long [1];
 	C.memmove(ptr, list[0], C.PTR_SIZEOF);
 	int length = C.strlen(ptr[0]);
 	byte[] utf8 = new byte[length];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
index f2ba212bac..6b5a7c2a19 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
@@ -1861,24 +1861,24 @@ JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1pixbuf_1scale_1simple)
 
 #ifndef NO__1gdk_1property_1get
 JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1property_1get)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jintLongArray arg6, jintArray arg7, jintArray arg8, jintLongArray arg9)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jint arg5, jlongArray arg6, jintArray arg7, jintArray arg8, jlongArray arg9)
 {
-	jintLong *lparg6=NULL;
+	jlong *lparg6=NULL;
 	jint *lparg7=NULL;
 	jint *lparg8=NULL;
-	jintLong *lparg9=NULL;
+	jlong *lparg9=NULL;
 	jboolean rc = 0;
 	GDK_NATIVE_ENTER(env, that, _1gdk_1property_1get_FUNC);
-	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = (*env)->GetIntArrayElements(env, arg7, NULL)) == NULL) goto fail;
 	if (arg8) if ((lparg8 = (*env)->GetIntArrayElements(env, arg8, NULL)) == NULL) goto fail;
-	if (arg9) if ((lparg9 = (*env)->GetIntLongArrayElements(env, arg9, NULL)) == NULL) goto fail;
+	if (arg9) if ((lparg9 = (*env)->GetLongArrayElements(env, arg9, NULL)) == NULL) goto fail;
 	rc = (jboolean)gdk_property_get((GdkWindow *)arg0, (GdkAtom)arg1, (GdkAtom)arg2, arg3, arg4, arg5, (GdkAtom *)lparg6, (gint *)lparg7, (gint *)lparg8, (guchar **)lparg9);
 fail:
-	if (arg9 && lparg9) (*env)->ReleaseIntLongArrayElements(env, arg9, lparg9, 0);
+	if (arg9 && lparg9) (*env)->ReleaseLongArrayElements(env, arg9, lparg9, 0);
 	if (arg8 && lparg8) (*env)->ReleaseIntArrayElements(env, arg8, lparg8, 0);
 	if (arg7 && lparg7) (*env)->ReleaseIntArrayElements(env, arg7, lparg7, 0);
-	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
+	if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0);
 	GDK_NATIVE_EXIT(env, that, _1gdk_1property_1get_FUNC);
 	return rc;
 }
@@ -2451,14 +2451,14 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1surface_1get_1state)
 
 #ifndef NO__1gdk_1surface_1get_1user_1data
 JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1get_1user_1data)
-	(JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
 {
-	jintLong *lparg1=NULL;
+	jlong *lparg1=NULL;
 	GDK_NATIVE_ENTER(env, that, _1gdk_1surface_1get_1user_1data_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gdk_surface_get_user_data((GdkSurface *)arg0, (gpointer *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
 	GDK_NATIVE_EXIT(env, that, _1gdk_1surface_1get_1user_1data_FUNC);
 }
 #endif
@@ -2645,15 +2645,15 @@ JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1surface_1show_1unraised)
 
 #ifndef NO__1gdk_1text_1property_1to_1utf8_1list_1for_1display
 JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1text_1property_1to_1utf8_1list_1for_1display)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jint arg4, jintLongArray arg5)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5)
 {
-	jintLong *lparg5=NULL;
+	jlong *lparg5=NULL;
 	jint rc = 0;
 	GDK_NATIVE_ENTER(env, that, _1gdk_1text_1property_1to_1utf8_1list_1for_1display_FUNC);
-	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	rc = (jint)gdk_text_property_to_utf8_list_for_display((GdkDisplay *)arg0, (GdkAtom)arg1, arg2, (guchar *)arg3, arg4, (gchar ***)lparg5);
 fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
+	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
 	GDK_NATIVE_EXIT(env, that, _1gdk_1text_1property_1to_1utf8_1list_1for_1display_FUNC);
 	return rc;
 }
@@ -2889,14 +2889,14 @@ JNIEXPORT jint JNICALL GDK_NATIVE(_1gdk_1window_1get_1state)
 
 #ifndef NO__1gdk_1window_1get_1user_1data
 JNIEXPORT void JNICALL GDK_NATIVE(_1gdk_1window_1get_1user_1data)
-	(JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
 {
-	jintLong *lparg1=NULL;
+	jlong *lparg1=NULL;
 	GDK_NATIVE_ENTER(env, that, _1gdk_1window_1get_1user_1data_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	gdk_window_get_user_data((GdkWindow *)arg0, (gpointer *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
 	GDK_NATIVE_EXIT(env, that, _1gdk_1window_1get_1user_1data_FUNC);
 }
 #endif
@@ -3193,26 +3193,26 @@ JNIEXPORT jlong JNICALL GDK_NATIVE(_1gdk_1x11_1display_1get_1xdisplay)
 
 #ifndef NO__1gdk_1x11_1display_1utf8_1to_1compound_1text
 JNIEXPORT jboolean JNICALL GDK_NATIVE(_1gdk_1x11_1display_1utf8_1to_1compound_1text)
-	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jintLongArray arg2, jintArray arg3, jintLongArray arg4, jintArray arg5)
+	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlongArray arg2, jintArray arg3, jlongArray arg4, jintArray arg5)
 {
 	jbyte *lparg1=NULL;
-	jintLong *lparg2=NULL;
+	jlong *lparg2=NULL;
 	jint *lparg3=NULL;
-	jintLong *lparg4=NULL;
+	jlong *lparg4=NULL;
 	jint *lparg5=NULL;
 	jboolean rc = 0;
 	GDK_NATIVE_ENTER(env, that, _1gdk_1x11_1display_1utf8_1to_1compound_1text_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	rc = (jboolean)gdk_x11_display_utf8_to_compound_text((GdkDisplay *)arg0, (const gchar*)lparg1, (GdkAtom *)lparg2, (gint *)lparg3, (guchar **)lparg4, (gint *)lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	GDK_NATIVE_EXIT(env, that, _1gdk_1x11_1display_1utf8_1to_1compound_1text_FUNC);
 	return rc;
@@ -5466,7 +5466,7 @@ JNIEXPORT jint JNICALL GTK_NATIVE(_1gtk_1entry_1text_1index_1to_1layout_1index)
 
 #ifndef NO__1gtk_1enumerate_1printers
 JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1enumerate_1printers)
-	(JNIEnv *env, jclass that, jlong arg0, jintLong arg1, jlong arg2, jboolean arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jboolean arg3)
 {
 	GTK_NATIVE_ENTER(env, that, _1gtk_1enumerate_1printers_FUNC);
 	gtk_enumerate_printers((GtkPrinterFunc)arg0, (gpointer)arg1, (GDestroyNotify)arg2, (gboolean)arg3);
@@ -6666,20 +6666,20 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1focus_1out)
 
 #ifndef NO__1gtk_1im_1context_1get_1preedit_1string
 JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1im_1context_1get_1preedit_1string)
-	(JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1, jintLongArray arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2, jintArray arg3)
 {
-	jintLong *lparg1=NULL;
-	jintLong *lparg2=NULL;
+	jlong *lparg1=NULL;
+	jlong *lparg2=NULL;
 	jint *lparg3=NULL;
 	GTK_NATIVE_ENTER(env, that, _1gtk_1im_1context_1get_1preedit_1string_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = (*env)->GetIntArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	gtk_im_context_get_preedit_string((GtkIMContext *)arg0, (gchar **)lparg1, (PangoAttrList **)lparg2, (gint *)lparg3);
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseIntArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
 	GTK_NATIVE_EXIT(env, that, _1gtk_1im_1context_1get_1preedit_1string_FUNC);
 }
 #endif
@@ -6951,23 +6951,16 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1init_1check__)
 }
 #endif
 
-#if (!defined(NO__1gtk_1init_1check___3I_3I) && !defined(JNI64)) || (!defined(NO__1gtk_1init_1check___3J_3J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1init_1check___3I_3I)(JNIEnv *env, jclass that, jintLongArray arg0, jintLongArray arg1)
-#else
-JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1init_1check___3J_3J)(JNIEnv *env, jclass that, jintLongArray arg0, jintLongArray arg1)
-#endif
+#ifndef NO__1gtk_1init_1check___3J_3J
+JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1init_1check___3J_3J)
+	(JNIEnv *env, jclass that, jlongArray arg0, jlongArray arg1)
 {
-	jintLong *lparg0=NULL;
-	jintLong *lparg1=NULL;
+	jlong *lparg0=NULL;
+	jlong *lparg1=NULL;
 	jboolean rc = 0;
-#ifndef JNI64
-	GTK_NATIVE_ENTER(env, that, _1gtk_1init_1check___3I_3I_FUNC);
-#else
 	GTK_NATIVE_ENTER(env, that, _1gtk_1init_1check___3J_3J_FUNC);
-#endif
-	if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg0) if ((lparg0 = (*env)->GetLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
 	rc = (jboolean)gtk_init_check((int *)lparg0, (char ***)lparg1);
 */
@@ -6978,13 +6971,9 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1init_1check___3J_3J)(JNIEnv *env, j
 		}
 	}
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
-	if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0);
-#ifndef JNI64
-	GTK_NATIVE_EXIT(env, that, _1gtk_1init_1check___3I_3I_FUNC);
-#else
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
+	if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0);
 	GTK_NATIVE_EXIT(env, that, _1gtk_1init_1check___3J_3J_FUNC);
-#endif
 	return rc;
 }
 #endif
@@ -7203,15 +7192,15 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1list_1store_1insert)
 
 #ifndef NO__1gtk_1list_1store_1newv
 JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1list_1store_1newv)
-	(JNIEnv *env, jclass that, jint arg0, jintLongArray arg1)
+	(JNIEnv *env, jclass that, jint arg0, jlongArray arg1)
 {
-	jintLong *lparg1=NULL;
+	jlong *lparg1=NULL;
 	jlong rc = 0;
 	GTK_NATIVE_ENTER(env, that, _1gtk_1list_1store_1newv_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jlong)gtk_list_store_newv((gint)arg0, (GType *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
 	GTK_NATIVE_EXIT(env, that, _1gtk_1list_1store_1newv_FUNC);
 	return rc;
 }
@@ -10763,15 +10752,15 @@ JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1get_1select_1function
 
 #ifndef NO__1gtk_1tree_1selection_1get_1selected_1rows
 JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1selection_1get_1selected_1rows)
-	(JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
 {
-	jintLong *lparg1=NULL;
+	jlong *lparg1=NULL;
 	jlong rc = 0;
 	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jlong)gtk_tree_selection_get_selected_rows((GtkTreeSelection *)arg0, (GtkTreeModel **)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
 	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1selection_1get_1selected_1rows_FUNC);
 	return rc;
 }
@@ -10901,15 +10890,15 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1store_1insert)
 
 #ifndef NO__1gtk_1tree_1store_1newv
 JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1store_1newv)
-	(JNIEnv *env, jclass that, jint arg0, jintLongArray arg1)
+	(JNIEnv *env, jclass that, jint arg0, jlongArray arg1)
 {
-	jintLong *lparg1=NULL;
+	jlong *lparg1=NULL;
 	jlong rc = 0;
 	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1store_1newv_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jlong)gtk_tree_store_newv(arg0, (GType *)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
 	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1store_1newv_FUNC);
 	return rc;
 }
@@ -11074,12 +11063,12 @@ JNIEXPORT void JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1clear)
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1column_1get_1button
-JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1button)
+JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1column_1get_1button)
 	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1column_1get_1button_FUNC);
-	rc = (jintLong)gtk_tree_view_column_get_button((GtkTreeViewColumn *)arg0);
+	rc = (jlong)gtk_tree_view_column_get_button((GtkTreeViewColumn *)arg0);
 	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1column_1get_1button_FUNC);
 	return rc;
 }
@@ -11420,12 +11409,12 @@ fail:
 #endif
 
 #ifndef NO__1gtk_1tree_1view_1get_1expander_1column
-JNIEXPORT jintLong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1expander_1column)
+JNIEXPORT jlong JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1expander_1column)
 	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC);
-	rc = (jintLong)gtk_tree_view_get_expander_column((GtkTreeView *)arg0);
+	rc = (jlong)gtk_tree_view_get_expander_column((GtkTreeView *)arg0);
 	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1expander_1column_FUNC);
 	return rc;
 }
@@ -11457,24 +11446,24 @@ JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1headers_1visible)
 
 #ifndef NO__1gtk_1tree_1view_1get_1path_1at_1pos
 JNIEXPORT jboolean JNICALL GTK_NATIVE(_1gtk_1tree_1view_1get_1path_1at_1pos)
-	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jintLongArray arg3, jintLongArray arg4, jintArray arg5, jintArray arg6)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jlongArray arg3, jlongArray arg4, jintArray arg5, jintArray arg6)
 {
-	jintLong *lparg3=NULL;
-	jintLong *lparg4=NULL;
+	jlong *lparg3=NULL;
+	jlong *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint *lparg6=NULL;
 	jboolean rc = 0;
 	GTK_NATIVE_ENTER(env, that, _1gtk_1tree_1view_1get_1path_1at_1pos_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	rc = (jboolean)gtk_tree_view_get_path_at_pos((GtkTreeView *)arg0, (gint)arg1, (gint)arg2, (GtkTreePath **)lparg3, (GtkTreeViewColumn **)lparg4, (gint *)lparg5, (gint *)lparg6);
 fail:
 	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
-	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
 	GTK_NATIVE_EXIT(env, that, _1gtk_1tree_1view_1get_1path_1at_1pos_FUNC);
 	return rc;
 }
@@ -14237,10 +14226,10 @@ JNIEXPORT void JNICALL OS_NATIVE(_1XFree)
 
 #ifndef NO__1XQueryPointer
 JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryPointer)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jintArray arg4, jintArray arg5, jintArray arg6, jintArray arg7, jintArray arg8)
 {
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
+	jlong *lparg2=NULL;
+	jlong *lparg3=NULL;
 	jint *lparg4=NULL;
 	jint *lparg5=NULL;
 	jint *lparg6=NULL;
@@ -14248,8 +14237,8 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1XQueryPointer)
 	jint *lparg8=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1XQueryPointer_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetIntArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
 	if (arg6) if ((lparg6 = (*env)->GetIntArrayElements(env, arg6, NULL)) == NULL) goto fail;
@@ -14262,8 +14251,8 @@ fail:
 	if (arg6 && lparg6) (*env)->ReleaseIntArrayElements(env, arg6, lparg6, 0);
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseIntArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1XQueryPointer_FUNC);
 	return rc;
 }
@@ -14648,20 +14637,20 @@ fail:
 
 #ifndef NO__1g_1dbus_1connection_1register_1object
 JNIEXPORT jint JNICALL OS_NATIVE(_1g_1dbus_1connection_1register_1object)
-	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jintLongArray arg3, jlong arg4, jlong arg5, jintLongArray arg6)
+	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jlongArray arg3, jlong arg4, jlong arg5, jlongArray arg6)
 {
 	jbyte *lparg1=NULL;
-	jintLong *lparg3=NULL;
-	jintLong *lparg6=NULL;
+	jlong *lparg3=NULL;
+	jlong *lparg6=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1dbus_1connection_1register_1object_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	rc = (jint)g_dbus_connection_register_object((GDBusConnection *)arg0, (const gchar *)lparg1, (GDBusInterfaceInfo *)arg2, (const GDBusInterfaceVTable *)lparg3, (gpointer)arg4, (GDestroyNotify)arg5, (GError **)lparg6);
 fail:
-	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0);
+	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1dbus_1connection_1register_1object_FUNC);
 	return rc;
@@ -14696,17 +14685,17 @@ fail:
 
 #ifndef NO__1g_1dbus_1node_1info_1new_1for_1xml
 JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1dbus_1node_1info_1new_1for_1xml)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jintLongArray arg1)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jlongArray arg1)
 {
 	jbyte *lparg0=NULL;
-	jintLong *lparg1=NULL;
+	jlong *lparg1=NULL;
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1dbus_1node_1info_1new_1for_1xml_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jlong)g_dbus_node_info_new_for_xml((const gchar *)lparg0, (GError **)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1dbus_1node_1info_1new_1for_1xml_FUNC);
 	return rc;
@@ -14715,16 +14704,16 @@ fail:
 
 #ifndef NO__1g_1dbus_1proxy_1call
 JNIEXPORT void JNICALL OS_NATIVE(_1g_1dbus_1proxy_1call)
-	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jlong arg6, jintLongArray arg7)
+	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jlong arg6, jlongArray arg7)
 {
 	jbyte *lparg1=NULL;
-	jintLong *lparg7=NULL;
+	jlong *lparg7=NULL;
 	OS_NATIVE_ENTER(env, that, _1g_1dbus_1proxy_1call_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = (*env)->GetLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
 	g_dbus_proxy_call((GDBusProxy *)arg0, (const gchar *)lparg1, (GVariant *)arg2, arg3, arg4, (GCancellable *)arg5, (GAsyncReadyCallback)arg6, (GError **)lparg7);
 fail:
-	if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0);
+	if (arg7 && lparg7) (*env)->ReleaseLongArrayElements(env, arg7, lparg7, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1dbus_1proxy_1call_FUNC);
 }
@@ -14732,15 +14721,15 @@ fail:
 
 #ifndef NO__1g_1dbus_1proxy_1call_1finish
 JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1dbus_1proxy_1call_1finish)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2)
 {
-	jintLong *lparg2=NULL;
+	jlong *lparg2=NULL;
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1dbus_1proxy_1call_1finish_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 = (jlong)g_dbus_proxy_call_finish((GDBusProxy *)arg0, (GAsyncResult *)arg1, (GError **)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, _1g_1dbus_1proxy_1call_1finish_FUNC);
 	return rc;
 }
@@ -14748,17 +14737,17 @@ fail:
 
 #ifndef NO__1g_1dbus_1proxy_1call_1sync
 JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1dbus_1proxy_1call_1sync)
-	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jintLongArray arg6)
+	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3, jint arg4, jlong arg5, jlongArray arg6)
 {
 	jbyte *lparg1=NULL;
-	jintLong *lparg6=NULL;
+	jlong *lparg6=NULL;
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1dbus_1proxy_1call_1sync_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg6) if ((lparg6 = (*env)->GetIntLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
+	if (arg6) if ((lparg6 = (*env)->GetLongArrayElements(env, arg6, NULL)) == NULL) goto fail;
 	rc = (jlong)g_dbus_proxy_call_sync((GDBusProxy *)arg0, (const gchar *)lparg1, (GVariant *)arg2, arg3, arg4, (GCancellable *)arg5, (GError **)lparg6);
 fail:
-	if (arg6 && lparg6) (*env)->ReleaseIntLongArrayElements(env, arg6, lparg6, 0);
+	if (arg6 && lparg6) (*env)->ReleaseLongArrayElements(env, arg6, lparg6, 0);
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1dbus_1proxy_1call_1sync_FUNC);
 	return rc;
@@ -14767,21 +14756,21 @@ fail:
 
 #ifndef NO__1g_1dbus_1proxy_1new_1for_1bus_1sync
 JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1dbus_1proxy_1new_1for_1bus_1sync)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jintLongArray arg7)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jbyteArray arg3, jbyteArray arg4, jbyteArray arg5, jlong arg6, jlongArray arg7)
 {
 	jbyte *lparg3=NULL;
 	jbyte *lparg4=NULL;
 	jbyte *lparg5=NULL;
-	jintLong *lparg7=NULL;
+	jlong *lparg7=NULL;
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1dbus_1proxy_1new_1for_1bus_1sync_FUNC);
 	if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetByteArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	if (arg7) if ((lparg7 = (*env)->GetIntLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
+	if (arg7) if ((lparg7 = (*env)->GetLongArrayElements(env, arg7, NULL)) == NULL) goto fail;
 	rc = (jlong)g_dbus_proxy_new_for_bus_sync(arg0, arg1, (GDBusInterfaceInfo *)arg2, (const gchar *)lparg3, (const gchar *)lparg4, (const gchar *)lparg5, (GCancellable *)arg6, (GError **)lparg7);
 fail:
-	if (arg7 && lparg7) (*env)->ReleaseIntLongArrayElements(env, arg7, lparg7, 0);
+	if (arg7 && lparg7) (*env)->ReleaseLongArrayElements(env, arg7, lparg7, 0);
 	if (arg5 && lparg5) (*env)->ReleaseByteArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0);
 	if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0);
@@ -14930,18 +14919,18 @@ JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1display_1name)
 
 #ifndef NO__1g_1filename_1from_1uri
 JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1from_1uri)
-	(JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1, jintLongArray arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2)
 {
-	jintLong *lparg1=NULL;
-	jintLong *lparg2=NULL;
+	jlong *lparg1=NULL;
+	jlong *lparg2=NULL;
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1uri_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	rc = (jlong)g_filename_from_uri((const char *)arg0, (char **)lparg1, (GError **)lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1filename_1from_1uri_FUNC);
 	return rc;
 }
@@ -14949,21 +14938,21 @@ fail:
 
 #ifndef NO__1g_1filename_1from_1utf8
 JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1from_1utf8)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
 {
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
-	jintLong *lparg4=NULL;
+	jlong *lparg2=NULL;
+	jlong *lparg3=NULL;
+	jlong *lparg4=NULL;
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1filename_1from_1utf8_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jlong)g_filename_from_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1filename_1from_1utf8_FUNC);
 	return rc;
 }
@@ -14971,15 +14960,15 @@ fail:
 
 #ifndef NO__1g_1filename_1to_1uri
 JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1to_1uri)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2)
 {
-	jintLong *lparg2=NULL;
+	jlong *lparg2=NULL;
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1uri_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 = (jlong)g_filename_to_uri((const char *)arg0, (const char *)arg1, (GError **)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, _1g_1filename_1to_1uri_FUNC);
 	return rc;
 }
@@ -14987,21 +14976,21 @@ fail:
 
 #ifndef NO__1g_1filename_1to_1utf8
 JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1filename_1to_1utf8)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
 {
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
-	jintLong *lparg4=NULL;
+	jlong *lparg2=NULL;
+	jlong *lparg3=NULL;
+	jlong *lparg4=NULL;
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1filename_1to_1utf8_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetIntLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg4) if ((lparg4 = (*env)->GetLongArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	rc = (jlong)g_filename_to_utf8((const gchar *)arg0, (gssize)arg1, (gsize *)lparg2, (gsize *)lparg3, (GError **)lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseIntLongArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg4 && lparg4) (*env)->ReleaseLongArrayElements(env, arg4, lparg4, 0);
+	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1filename_1to_1utf8_FUNC);
 	return rc;
 }
@@ -15972,15 +15961,15 @@ JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1string_1new_1len)
 
 #ifndef NO__1g_1strtod
 JNIEXPORT jdouble JNICALL OS_NATIVE(_1g_1strtod)
-	(JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
 {
-	jintLong *lparg1=NULL;
+	jlong *lparg1=NULL;
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1strtod_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	rc = (jdouble)g_strtod((const gchar *)arg0, (gchar **)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1strtod_FUNC);
 	return rc;
 }
@@ -16176,12 +16165,12 @@ JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf16_1strlen)
 
 #ifndef NO__1g_1utf16_1to_1utf8
 JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf16_1to_1utf8)
-	(JNIEnv *env, jclass that, jcharArray arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
+	(JNIEnv *env, jclass that, jcharArray arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
 {
 	jchar *lparg0=NULL;
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
-	jintLong *lparg4=NULL;
+	jlong *lparg2=NULL;
+	jlong *lparg3=NULL;
+	jlong *lparg4=NULL;
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1utf16_1to_1utf8_FUNC);
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
@@ -16235,22 +16224,15 @@ JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1strlen)
 }
 #endif
 
-#if (!defined(NO__1g_1utf8_1to_1utf16__JJ_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16__JJ_3J_3J_3J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__JJ_3I_3I_3I)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
-#else
-JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__JJ_3J_3J_3J)(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
-#endif
+#ifndef NO__1g_1utf8_1to_1utf16__JJ_3J_3J_3J
+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16__JJ_3J_3J_3J)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
 {
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
-	jintLong *lparg4=NULL;
+	jlong *lparg2=NULL;
+	jlong *lparg3=NULL;
+	jlong *lparg4=NULL;
 	jlong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__JJ_3I_3I_3I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
-#endif
 		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
 		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
 		if (arg4) if ((lparg4 = (*env)->GetPrimitiveArrayCritical(env, arg4, NULL)) == NULL) goto fail;
@@ -16259,32 +16241,21 @@ fail:
 		if (arg4 && lparg4) (*env)->ReleasePrimitiveArrayCritical(env, arg4, lparg4, 0);
 		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
 		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__JJ_3I_3I_3I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO__1g_1utf8_1to_1utf16___3BJ_3I_3I_3I) && !defined(JNI64)) || (!defined(NO__1g_1utf8_1to_1utf16___3BJ_3J_3J_3J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3I_3I_3I)(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
-#else
-JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J)(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3, jintLongArray arg4)
-#endif
+#ifndef NO__1g_1utf8_1to_1utf16___3BJ_3J_3J_3J
+JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1, jlongArray arg2, jlongArray arg3, jlongArray arg4)
 {
 	jbyte *lparg0=NULL;
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
-	jintLong *lparg4=NULL;
+	jlong *lparg2=NULL;
+	jlong *lparg3=NULL;
+	jlong *lparg4=NULL;
 	jlong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BJ_3I_3I_3I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
-#endif
 		if (arg0) if ((lparg0 = (*env)->GetPrimitiveArrayCritical(env, arg0, NULL)) == NULL) goto fail;
 		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
 		if (arg3) if ((lparg3 = (*env)->GetPrimitiveArrayCritical(env, arg3, NULL)) == NULL) goto fail;
@@ -16295,11 +16266,7 @@ fail:
 		if (arg3 && lparg3) (*env)->ReleasePrimitiveArrayCritical(env, arg3, lparg3, 0);
 		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
 		if (arg0 && lparg0) (*env)->ReleasePrimitiveArrayCritical(env, arg0, lparg0, JNI_ABORT);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BJ_3I_3I_3I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, _1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC);
-#endif
 	return rc;
 }
 #endif
@@ -16566,15 +16533,15 @@ fail:
 
 #ifndef NO__1g_1variant_1new_1tuple
 JNIEXPORT jlong JNICALL OS_NATIVE(_1g_1variant_1new_1tuple)
-	(JNIEnv *env, jclass that, jintLongArray arg0, jlong arg1)
+	(JNIEnv *env, jclass that, jlongArray arg0, jlong arg1)
 {
-	jintLong *lparg0=NULL;
+	jlong *lparg0=NULL;
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1g_1variant_1new_1tuple_FUNC);
-	if (arg0) if ((lparg0 = (*env)->GetIntLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
+	if (arg0) if ((lparg0 = (*env)->GetLongArrayElements(env, arg0, NULL)) == NULL) goto fail;
 	rc = (jlong)g_variant_new_tuple((GVariant * const *)lparg0, (gsize)arg1);
 fail:
-	if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0);
+	if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, _1g_1variant_1new_1tuple_FUNC);
 	return rc;
 }
@@ -16992,17 +16959,17 @@ JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1context_1get_1metrics)
 
 #ifndef NO__1pango_1context_1list_1families
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1context_1list_1families)
-	(JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jintArray arg2)
 {
-	jintLong *lparg1=NULL;
+	jlong *lparg1=NULL;
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1pango_1context_1list_1families_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	pango_context_list_families((PangoContext *)arg0, (PangoFontFamily ***)lparg1, (int *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1pango_1context_1list_1families_FUNC);
 }
 #endif
@@ -17251,17 +17218,17 @@ JNIEXPORT jlong JNICALL OS_NATIVE(_1pango_1font_1family_1get_1name)
 
 #ifndef NO__1pango_1font_1family_1list_1faces
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1font_1family_1list_1faces)
-	(JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jintArray arg2)
 {
-	jintLong *lparg1=NULL;
+	jlong *lparg1=NULL;
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1pango_1font_1family_1list_1faces_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	pango_font_family_list_faces((PangoFontFamily *)arg0, (PangoFontFace ***)lparg1, (int *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1pango_1font_1family_1list_1faces_FUNC);
 }
 #endif
@@ -17432,17 +17399,17 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1line_1count)
 
 #ifndef NO__1pango_1layout_1get_1log_1attrs
 JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1get_1log_1attrs)
-	(JNIEnv *env, jclass that, jlong arg0, jintLongArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jintArray arg2)
 {
-	jintLong *lparg1=NULL;
+	jlong *lparg1=NULL;
 	jint *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1log_1attrs_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetIntLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetLongArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	pango_layout_get_log_attrs((PangoLayout*)arg0, (PangoLogAttr **)lparg1, (int *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseIntLongArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseLongArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1log_1attrs_FUNC);
 }
 #endif
@@ -17885,18 +17852,18 @@ JNIEXPORT void JNICALL OS_NATIVE(_1swt_1fixed_1restack)
 #endif
 
 #ifndef NO__1ubuntu_1menu_1proxy_1get
-JNIEXPORT jintLong JNICALL OS_NATIVE(_1ubuntu_1menu_1proxy_1get)
+JNIEXPORT jlong JNICALL OS_NATIVE(_1ubuntu_1menu_1proxy_1get)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, _1ubuntu_1menu_1proxy_1get_FUNC);
 /*
-	rc = (jintLong)ubuntu_menu_proxy_get();
+	rc = (jlong)ubuntu_menu_proxy_get();
 */
 	{
 		OS_LOAD_FUNCTION(fp, ubuntu_menu_proxy_get)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
+			rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, _1ubuntu_1menu_1proxy_1get_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
index 2a7bb8538a..1d9288674a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
@@ -559,11 +559,7 @@ char * GTK_nativeFunctionNames[] = {
 	"_1gtk_1image_1set_1from_1pixbuf",
 	"_1gtk_1image_1set_1pixel_1size",
 	"_1gtk_1init_1check__",
-#ifndef JNI64
-	"_1gtk_1init_1check___3I_3I",
-#else
 	"_1gtk_1init_1check___3J_3J",
-#endif
 	"_1gtk_1label_1get_1layout",
 	"_1gtk_1label_1get_1mnemonic_1keyval",
 	"_1gtk_1label_1get_1type",
@@ -1336,16 +1332,8 @@ char * OS_nativeFunctionNames[] = {
 	"_1g_1utf8_1offset_1to_1utf16_1offset",
 	"_1g_1utf8_1pointer_1to_1offset",
 	"_1g_1utf8_1strlen",
-#ifndef JNI64
-	"_1g_1utf8_1to_1utf16__JJ_3I_3I_3I",
-#else
 	"_1g_1utf8_1to_1utf16__JJ_3J_3J_3J",
-#endif
-#ifndef JNI64
-	"_1g_1utf8_1to_1utf16___3BJ_3I_3I_3I",
-#else
 	"_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J",
-#endif
 	"_1g_1value_1peek_1pointer",
 	"_1g_1variant_1builder_1add_1value",
 	"_1g_1variant_1builder_1end",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
index 8722621d2f..c261995026 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
@@ -557,11 +557,7 @@ typedef enum {
 	_1gtk_1image_1set_1from_1pixbuf_FUNC,
 	_1gtk_1image_1set_1pixel_1size_FUNC,
 	_1gtk_1init_1check___FUNC,
-#ifndef JNI64
-	_1gtk_1init_1check___3I_3I_FUNC,
-#else
 	_1gtk_1init_1check___3J_3J_FUNC,
-#endif
 	_1gtk_1label_1get_1layout_FUNC,
 	_1gtk_1label_1get_1mnemonic_1keyval_FUNC,
 	_1gtk_1label_1get_1type_FUNC,
@@ -1310,16 +1306,8 @@ typedef enum {
 	_1g_1utf8_1offset_1to_1utf16_1offset_FUNC,
 	_1g_1utf8_1pointer_1to_1offset_FUNC,
 	_1g_1utf8_1strlen_FUNC,
-#ifndef JNI64
-	_1g_1utf8_1to_1utf16__JJ_3I_3I_3I_FUNC,
-#else
 	_1g_1utf8_1to_1utf16__JJ_3J_3J_3J_FUNC,
-#endif
-#ifndef JNI64
-	_1g_1utf8_1to_1utf16___3BJ_3I_3I_3I_FUNC,
-#else
 	_1g_1utf8_1to_1utf16___3BJ_3J_3J_3J_FUNC,
-#endif
 	_1g_1value_1peek_1pointer_FUNC,
 	_1g_1variant_1builder_1add_1value_FUNC,
 	_1g_1variant_1builder_1end_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java
index ce0a2fe542..2be4f1e277 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GDK.java
@@ -1792,9 +1792,9 @@ public class GDK extends OS {
 	 * @param actual_length cast=(gint *)
 	 * @param data cast=(guchar **)
 	 */
-	public static final native boolean _gdk_property_get(long window, long property, long type, long offset, long length, int pdelete, long /*int*/[] actual_property_type, int[] actual_format, int[] actual_length, long /*int*/[] data);
+	public static final native boolean _gdk_property_get(long window, long property, long type, long offset, long length, int pdelete, long [] actual_property_type, int[] actual_format, int[] actual_length, long [] data);
 	/** [GTK3 only, if-def'd in os.h] */
-	public static final boolean gdk_property_get(long window, long property, long type, long offset, long length, int pdelete, long /*int*/[] actual_property_type, int[] actual_format, int[] actual_length, long /*int*/[] data) {
+	public static final boolean gdk_property_get(long window, long property, long type, long offset, long length, int pdelete, long [] actual_property_type, int[] actual_format, int[] actual_length, long [] data) {
 		lock.lock();
 		try {
 			return _gdk_property_get(window, property, type, offset, length, pdelete, actual_property_type, actual_format, actual_length, data);
@@ -2300,8 +2300,8 @@ public class GDK extends OS {
 	 * @param ctext cast=(guchar **)
 	 * @param length cast=(gint *)
 	 */
-	public static final native boolean _gdk_x11_display_utf8_to_compound_text(long display, byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length);
-	public static final boolean gdk_x11_display_utf8_to_compound_text(long display, byte[] str, long /*int*/[] encoding, int[] format, long /*int*/[] ctext, int[] length) {
+	public static final native boolean _gdk_x11_display_utf8_to_compound_text(long display, byte[] str, long [] encoding, int[] format, long [] ctext, int[] length);
+	public static final boolean gdk_x11_display_utf8_to_compound_text(long display, byte[] str, long [] encoding, int[] format, long [] ctext, int[] length) {
 		lock.lock();
 		try {
 			return _gdk_x11_display_utf8_to_compound_text(display, str, encoding, format, ctext, length);
@@ -2325,8 +2325,8 @@ public class GDK extends OS {
 	 * @param text cast=(guchar *)
 	 * @param list cast=(gchar ***)
 	 */
-	public static final native int _gdk_text_property_to_utf8_list_for_display  (long display, long encoding, int format, long text, int length,  long /*int*/[] list);
-	public static final int gdk_text_property_to_utf8_list_for_display  (long display, long encoding, int format, long text, int length,  long /*int*/[] list) {
+	public static final native int _gdk_text_property_to_utf8_list_for_display  (long display, long encoding, int format, long text, int length,  long [] list);
+	public static final int gdk_text_property_to_utf8_list_for_display  (long display, long encoding, int format, long text, int length,  long [] list) {
 		lock.lock();
 		try {
 			return _gdk_text_property_to_utf8_list_for_display(display, encoding, format, text, length, list);
@@ -2612,9 +2612,9 @@ public class GDK extends OS {
 	 * @param window cast=(GdkWindow *)
 	 * @param data cast=(gpointer *)
 	 */
-	public static final native void _gdk_window_get_user_data(long window, long /*int*/[] data);
+	public static final native void _gdk_window_get_user_data(long window, long [] data);
 	/** [GTK3 only, if-def'd in os.h] */
-	public static final void gdk_window_get_user_data(long window, long /*int*/[] data) {
+	public static final void gdk_window_get_user_data(long window, long [] data) {
 		lock.lock();
 		try {
 			_gdk_window_get_user_data(window, data);
@@ -2626,9 +2626,9 @@ public class GDK extends OS {
 	 * @param surface cast=(GdkSurface *)
 	 * @param data cast=(gpointer *)
 	 */
-	public static final native void _gdk_surface_get_user_data(long surface, long /*int*/[] data);
+	public static final native void _gdk_surface_get_user_data(long surface, long [] data);
 	/** [GTK4 only, if-def'd in os.h] */
-	public static final void gdk_surface_get_user_data(long surface, long /*int*/[] data) {
+	public static final void gdk_surface_get_user_data(long surface, long [] data) {
 		lock.lock();
 		try {
 			_gdk_surface_get_user_data(surface, data);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
index e45bcb2fc7..6d85fbd4fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
@@ -3492,8 +3492,8 @@ public class GTK extends OS {
 	 * @param attrs cast=(PangoAttrList **)
 	 * @param cursor_pos cast=(gint *)
 	 */
-	public static final native void _gtk_im_context_get_preedit_string(long context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos);
-	public static final void gtk_im_context_get_preedit_string(long context, long /*int*/[] str, long /*int*/[] attrs, int[] cursor_pos) {
+	public static final native void _gtk_im_context_get_preedit_string(long context, long [] str, long [] attrs, int[] cursor_pos);
+	public static final void gtk_im_context_get_preedit_string(long context, long [] str, long [] attrs, int[] cursor_pos) {
 		lock.lock();
 		try {
 			_gtk_im_context_get_preedit_string(context, str, attrs, cursor_pos);
@@ -3710,9 +3710,9 @@ public class GTK extends OS {
 	 * @param argc cast=(int *)
 	 * @param argv cast=(char ***)
 	 */
-	public static final native boolean _gtk_init_check(long /*int*/[] argc, long /*int*/[] argv);
+	public static final native boolean _gtk_init_check(long [] argc, long [] argv);
 	/** [GTK3 only] */
-	public static final boolean gtk_init_check(long /*int*/[] argc, long /*int*/[] argv) {
+	public static final boolean gtk_init_check(long [] argc, long [] argv) {
 		lock.lock();
 		try {
 			return _gtk_init_check(argc, argv);
@@ -3914,8 +3914,8 @@ public class GTK extends OS {
 	 * @param numColumns cast=(gint)
 	 * @param types cast=(GType *)
 	 */
-	public static final native long _gtk_list_store_newv(int numColumns, long /*int*/[] types);
-	public static final long gtk_list_store_newv(int numColumns, long /*int*/[] types) {
+	public static final native long _gtk_list_store_newv(int numColumns, long [] types);
+	public static final long gtk_list_store_newv(int numColumns, long [] types) {
 		lock.lock();
 		try {
 			return _gtk_list_store_newv(numColumns, types);
@@ -3955,7 +3955,7 @@ public class GTK extends OS {
 		}
 	}
 	public static final native long _gtk_css_provider_new();
-	public static final long /*int*/gtk_css_provider_new() {
+	public static final long gtk_css_provider_new() {
 		lock.lock();
 		try {
 			return _gtk_css_provider_new();
@@ -4026,7 +4026,7 @@ public class GTK extends OS {
 	 */
 	public static final native void _gtk_style_context_add_provider (long context, long provider, int priority);
 	public static final void gtk_style_context_add_provider(
-		long /*int*/context, long /*int*/provider, int priority) {
+		long context, long provider, int priority) {
 		lock.lock();
 		try {
 			_gtk_style_context_add_provider(context, provider, priority);
@@ -4971,8 +4971,8 @@ public class GTK extends OS {
 	 * @param destroy cast=(GDestroyNotify)
 	 * @param wait cast=(gboolean)
 	 */
-	public static final native void _gtk_enumerate_printers(long func, long /*int*/data, long destroy, boolean wait);
-	public static final void gtk_enumerate_printers(long func, long /*int*/data, long destroy, boolean wait) {
+	public static final native void _gtk_enumerate_printers(long func, long data, long destroy, boolean wait);
+	public static final void gtk_enumerate_printers(long func, long data, long destroy, boolean wait) {
 		lock.lock();
 		try {
 			_gtk_enumerate_printers(func, data, destroy, wait);
@@ -7357,8 +7357,8 @@ public class GTK extends OS {
 	 * @param selection cast=(GtkTreeSelection *)
 	 * @param model cast=(GtkTreeModel **)
 	 */
-	public static final native long _gtk_tree_selection_get_selected_rows(long selection, long /*int*/[] model);
-	public static final long gtk_tree_selection_get_selected_rows(long selection, long /*int*/[] model) {
+	public static final native long _gtk_tree_selection_get_selected_rows(long selection, long [] model);
+	public static final long gtk_tree_selection_get_selected_rows(long selection, long [] model) {
 		lock.lock();
 		try {
 			return _gtk_tree_selection_get_selected_rows(selection, model);
@@ -7531,8 +7531,8 @@ public class GTK extends OS {
 		}
 	}
 	/** @param types cast=(GType *) */
-	public static final native long _gtk_tree_store_newv(int numColumns, long /*int*/[] types);
-	public static final long gtk_tree_store_newv(int numColumns, long /*int*/[] types) {
+	public static final native long _gtk_tree_store_newv(int numColumns, long [] types);
+	public static final long gtk_tree_store_newv(int numColumns, long [] types) {
 		lock.lock();
 		try {
 			return _gtk_tree_store_newv(numColumns, types);
@@ -7719,7 +7719,7 @@ public class GTK extends OS {
 	/**
 	 * @param column cast=(GtkTreeViewColumn *)
 	 */
-	public static final native long /*int*/_gtk_tree_view_column_get_button(long column);
+	public static final native long _gtk_tree_view_column_get_button(long column);
 	public static final long gtk_tree_view_column_get_button(long column) {
 		lock.lock();
 		try {
@@ -8039,8 +8039,8 @@ public class GTK extends OS {
 		}
 	}
 	/** @param tree_view cast=(GtkTreeView *) */
-	public static final native long /*int*/_gtk_tree_view_get_expander_column(long tree_view);
-	public static final long /*int*/gtk_tree_view_get_expander_column(long tree_view) {
+	public static final native long _gtk_tree_view_get_expander_column(long tree_view);
+	public static final long gtk_tree_view_get_expander_column(long tree_view) {
 		lock.lock();
 		try {
 			return _gtk_tree_view_get_expander_column(tree_view);
@@ -8104,8 +8104,8 @@ public class GTK extends OS {
 	 * @param cell_x cast=(gint *)
 	 * @param cell_y cast=(gint *)
 	 */
-	public static final native boolean _gtk_tree_view_get_path_at_pos(long tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y);
-	public static final boolean gtk_tree_view_get_path_at_pos(long tree_view, int x, int y, long /*int*/[] path, long /*int*/[] column, int[] cell_x, int[] cell_y) {
+	public static final native boolean _gtk_tree_view_get_path_at_pos(long tree_view, int x, int y, long [] path, long [] column, int[] cell_x, int[] cell_y);
+	public static final boolean gtk_tree_view_get_path_at_pos(long tree_view, int x, int y, long [] path, long [] column, int[] cell_x, int[] cell_y) {
 		lock.lock();
 		try {
 			return _gtk_tree_view_get_path_at_pos(tree_view, x, y, path, column, cell_x, cell_y);
@@ -8156,7 +8156,7 @@ public class GTK extends OS {
 	 * @param base_column cast=(GtkTreeViewColumn *)
 	 */
 	public static final native void _gtk_tree_view_move_column_after(long tree_view, long column, long base_column);
-	public static final void gtk_tree_view_move_column_after(long tree_view, long column, long /*int*/base_column) {
+	public static final void gtk_tree_view_move_column_after(long tree_view, long column, long base_column) {
 		lock.lock();
 		try {
 			_gtk_tree_view_move_column_after(tree_view, column, base_column);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 5aceaffc74..6e605618d6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -981,8 +981,8 @@ public static final void XFree(long address) {
  * @param win_y_return cast=(int *)
  * @param mask_return cast=(unsigned int *)
  */
-public static final native int _XQueryPointer(long display, long w, long /*int*/[] root_return, long /*int*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return);
-public static final int XQueryPointer(long display, long w, long /*int*/[] root_return, long /*int*/[] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return) {
+public static final native int _XQueryPointer(long display, long w, long [] root_return, long [] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return);
+public static final int XQueryPointer(long display, long w, long [] root_return, long [] child_return, int[] root_x_return, int[] root_y_return, int[] win_x_return, int[] win_y_return, int[] mask_return) {
 	lock.lock();
 	try {
 		return _XQueryPointer(display, w, root_return, child_return, root_x_return, root_y_return, win_x_return, win_y_return, mask_return);
@@ -1667,8 +1667,8 @@ public static final native void g_main_context_wakeup(long context);
  * @param bytes_written cast=(gsize *)
  * @param error cast=(GError **)
  */
-public static final native long _g_filename_to_utf8(long opsysstring, long len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error);
-public static final long g_filename_to_utf8(long opsysstring, long len, long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) {
+public static final native long _g_filename_to_utf8(long opsysstring, long len, long [] bytes_read, long [] bytes_written, long [] error);
+public static final long g_filename_to_utf8(long opsysstring, long len, long [] bytes_read, long [] bytes_written, long [] error) {
 	lock.lock();
 	try {
 		return _g_filename_to_utf8(opsysstring, len, bytes_read, bytes_written, error);
@@ -1691,8 +1691,8 @@ public static final long g_filename_display_name(long filename) {
  * @param hostname cast=(const char *)
  * @param error cast=(GError **)
  */
-public static final native long _g_filename_to_uri(long filename, long hostname, long /*int*/[] error);
-public static final long g_filename_to_uri(long filename, long hostname, long /*int*/[] error) {
+public static final native long _g_filename_to_uri(long filename, long hostname, long [] error);
+public static final long g_filename_to_uri(long filename, long hostname, long [] error) {
 	lock.lock();
 	try {
 		return _g_filename_to_uri(filename, hostname, error);
@@ -1707,8 +1707,8 @@ public static final long g_filename_to_uri(long filename, long hostname, long /*
  * @param bytes_written cast=(gsize *)
  * @param error cast=(GError **)
  */
-public static final native long _g_filename_from_utf8(long opsysstring, long len,  long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error);
-public static final long g_filename_from_utf8(long opsysstring, long len,  long /*int*/[] bytes_read, long /*int*/[] bytes_written, long /*int*/[] error) {
+public static final native long _g_filename_from_utf8(long opsysstring, long len,  long [] bytes_read, long [] bytes_written, long [] error);
+public static final long g_filename_from_utf8(long opsysstring, long len,  long [] bytes_read, long [] bytes_written, long [] error) {
 	lock.lock();
 	try {
 		return _g_filename_from_utf8(opsysstring, len, bytes_read, bytes_written, error);
@@ -1721,8 +1721,8 @@ public static final long g_filename_from_utf8(long opsysstring, long len,  long
  * @param hostname cast=(char **)
  * @param error cast=(GError **)
  */
-public static final native long _g_filename_from_uri(long uri, long /*int*/[] hostname, long /*int*/[] error);
-public static final long g_filename_from_uri(long uri, long /*int*/[] hostname, long /*int*/[] error) {
+public static final native long _g_filename_from_uri(long uri, long [] hostname, long [] error);
+public static final long g_filename_from_uri(long uri, long [] hostname, long [] error) {
 	lock.lock();
 	try {
 		return _g_filename_from_uri(uri, hostname, error);
@@ -2561,8 +2561,8 @@ public static final long g_string_free(long GString, int gboolen_free_segment) {
  * @param str cast=(const gchar *)
  * @param endptr cast=(gchar **)
  */
-public static final native double _g_strtod(long str, long /*int*/[] endptr);
-public static final double g_strtod(long str, long /*int*/[] endptr) {
+public static final native double _g_strtod(long str, long [] endptr);
+public static final double g_strtod(long str, long [] endptr) {
 	lock.lock();
 	try {
 		return _g_strtod(str, endptr);
@@ -2694,8 +2694,8 @@ public static final long g_type_register_static (long parent_type, byte[] type_n
  * @param items_written cast=(glong *),flags=critical
  * @param error cast=(GError **),flags=critical
  */
-public static final native long _g_utf16_to_utf8(char[] str, long len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error);
-public static final long g_utf16_to_utf8(char[] str, long len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) {
+public static final native long _g_utf16_to_utf8(char[] str, long len, long [] items_read, long [] items_written, long [] error);
+public static final long g_utf16_to_utf8(char[] str, long len, long [] items_read, long [] items_written, long [] error) {
 	lock.lock();
 	try {
 		return _g_utf16_to_utf8(str, len, items_read, items_written, error);
@@ -2733,8 +2733,8 @@ public static final long g_utf8_strlen(long str, long max) {
  * @param items_written cast=(glong *),flags=critical
  * @param error cast=(GError **),flags=critical
  */
-public static final native long _g_utf8_to_utf16(byte[] str, long len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error);
-public static final long g_utf8_to_utf16(byte[] str, long len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) {
+public static final native long _g_utf8_to_utf16(byte[] str, long len, long [] items_read, long [] items_written, long [] error);
+public static final long g_utf8_to_utf16(byte[] str, long len, long [] items_read, long [] items_written, long [] error) {
 	lock.lock();
 	try {
 		return _g_utf8_to_utf16(str, len, items_read, items_written, error);
@@ -2749,8 +2749,8 @@ public static final long g_utf8_to_utf16(byte[] str, long len, long /*int*/[] it
  * @param items_written cast=(glong *),flags=critical
  * @param error cast=(GError **),flags=critical
  */
-public static final native long _g_utf8_to_utf16(long str, long len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error);
-public static final long g_utf8_to_utf16(long str, long len, long /*int*/[] items_read, long /*int*/[] items_written, long /*int*/[] error) {
+public static final native long _g_utf8_to_utf16(long str, long len, long [] items_read, long [] items_written, long [] error);
+public static final long g_utf8_to_utf16(long str, long len, long [] items_read, long [] items_written, long [] error) {
 	lock.lock();
 	try {
 		return _g_utf8_to_utf16(str, len, items_read, items_written, error);
@@ -3334,8 +3334,8 @@ public static final long pango_context_get_metrics(long context, long desc, long
  * @param families cast=(PangoFontFamily ***)
  * @param n_families cast=(int *)
  */
-public static final native void _pango_context_list_families(long context, long /*int*/[] families, int[] n_families);
-public static final void pango_context_list_families(long context, long /*int*/[] families, int[] n_families) {
+public static final native void _pango_context_list_families(long context, long [] families, int[] n_families);
+public static final void pango_context_list_families(long context, long [] families, int[] n_families) {
 	lock.lock();
 	try {
 		_pango_context_list_families(context, families, n_families);
@@ -3578,8 +3578,8 @@ public static final long pango_font_family_get_name(long family) {
  * @param faces cast=(PangoFontFace ***)
  * @param n_faces cast=(int *)
  */
-public static final native void _pango_font_family_list_faces(long family, long /*int*/[] faces, int[] n_faces);
-public static final void pango_font_family_list_faces(long family, long /*int*/[] faces, int[] n_faces) {
+public static final native void _pango_font_family_list_faces(long family, long [] faces, int[] n_faces);
+public static final void pango_font_family_list_faces(long family, long [] faces, int[] n_faces) {
 	lock.lock();
 	try {
 		_pango_font_family_list_faces(family, faces, n_faces);
@@ -3737,8 +3737,8 @@ public static final int pango_layout_get_line_count(long layout) {
  * @param attrs cast=(PangoLogAttr **)
  * @param n_attrs cast=(int *)
  */
-public static final native void _pango_layout_get_log_attrs(long layout, long /*int*/[] attrs, int[] n_attrs);
-public static final void pango_layout_get_log_attrs(long layout, long /*int*/[] attrs, int[] n_attrs) {
+public static final native void _pango_layout_get_log_attrs(long layout, long [] attrs, int[] n_attrs);
+public static final void pango_layout_get_log_attrs(long layout, long [] attrs, int[] n_attrs) {
 	lock.lock();
 	try {
 		_pango_layout_get_log_attrs(layout, attrs, n_attrs);
@@ -4098,7 +4098,7 @@ public static final void pango_tab_array_set_tab(long tab_array, int tab_index,
 /**
  * @method flags=dynamic
  */
-public static final native long /*int*/_ubuntu_menu_proxy_get();
+public static final native long _ubuntu_menu_proxy_get();
 public static final long ubuntu_menu_proxy_get() {
 	lock.lock();
 	try {
@@ -4187,9 +4187,9 @@ public static final byte [] getThemeNameBytes() {
  * @category gdbus
  */
 public static final native long _g_dbus_proxy_new_for_bus_sync (int bus_type, int flags, long info, byte [] name, byte [] object_path, byte [] interface_name,
-		long cancellable, long /*int*/[] error);
+		long cancellable, long [] error);
 public static final long g_dbus_proxy_new_for_bus_sync (int bus_type, int flags, long info, byte [] name, byte [] object_path, byte [] interface_name,
-		long cancellable, long /*int*/[] error) {
+		long cancellable, long [] error) {
   lock.lock();
   try {
     return _g_dbus_proxy_new_for_bus_sync (bus_type, flags, info, name, object_path, interface_name, cancellable, error);
@@ -4206,8 +4206,8 @@ public static final long g_dbus_proxy_new_for_bus_sync (int bus_type, int flags,
  * @param error cast=(GError **)
  * @category gdbus
  */
-public static final native long _g_dbus_proxy_call_sync (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long /*int*/[] error);
-public static final long g_dbus_proxy_call_sync (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long /*int*/[] error) {
+public static final native long _g_dbus_proxy_call_sync (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long [] error);
+public static final long g_dbus_proxy_call_sync (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long [] error) {
 	lock.lock();
 	try {
 		return _g_dbus_proxy_call_sync (proxy, method_name, parameters, flags, timeout_msec, cancellable, error);
@@ -4225,8 +4225,8 @@ public static final long g_dbus_proxy_call_sync (long proxy, byte[] method_name,
  * @param error cast=(GError **)
  * @category gdbus
  */
-public static final native void _g_dbus_proxy_call (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long callback, long /*int*/[] error);
-public static final void g_dbus_proxy_call (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long callback, long /*int*/[] error) {
+public static final native void _g_dbus_proxy_call (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long callback, long [] error);
+public static final void g_dbus_proxy_call (long proxy, byte[] method_name, long parameters, int flags, int timeout_msec, long cancellable, long callback, long [] error) {
 	lock.lock();
 	try {
 		_g_dbus_proxy_call (proxy, method_name, parameters, flags, timeout_msec, cancellable, callback, error);
@@ -4241,8 +4241,8 @@ public static final void g_dbus_proxy_call (long proxy, byte[] method_name, long
  * @param error cast=(GError **)
  * @category gdbus
  */
-public static final native long _g_dbus_proxy_call_finish (long proxy, long res, long /*int*/[] error);
-public static final long g_dbus_proxy_call_finish (long proxy, long res, long /*int*/[] error) {
+public static final native long _g_dbus_proxy_call_finish (long proxy, long res, long [] error);
+public static final long g_dbus_proxy_call_finish (long proxy, long res, long [] error) {
 	lock.lock();
 	try {
 		return _g_dbus_proxy_call_finish (proxy, res, error);
@@ -4256,9 +4256,9 @@ public static final long g_dbus_proxy_call_finish (long proxy, long res, long /*
  * @param error cast=(GError **)
  * @category gdbus
  */
-public static final native long _g_dbus_node_info_new_for_xml (byte[] xml_data, long /*int*/[] error);
+public static final native long _g_dbus_node_info_new_for_xml (byte[] xml_data, long [] error);
 /** @category gdbus */
-public static final long g_dbus_node_info_new_for_xml (byte[] xml_data, long /*int*/[] error) {
+public static final long g_dbus_node_info_new_for_xml (byte[] xml_data, long [] error) {
   lock.lock();
   try {
     return _g_dbus_node_info_new_for_xml (xml_data, error);
@@ -4299,9 +4299,9 @@ public static final int g_bus_own_name (int bus_type, byte[] name, int flags, lo
  * @param error cast=(GError **)
  * @category gdbus
  */
-public static final native int _g_dbus_connection_register_object (long connection, byte[] object_path, long interface_info, long /*int*/[] vtable, long user_data, long user_data_free_func, long /*int*/[] error);
+public static final native int _g_dbus_connection_register_object (long connection, byte[] object_path, long interface_info, long [] vtable, long user_data, long user_data_free_func, long [] error);
 /** @category gdbus */
-public static final int g_dbus_connection_register_object (long connection, byte[] object_path, long interface_info, long /*int*/[] vtable, long user_data, long user_data_free_func, long /*int*/[] error) {
+public static final int g_dbus_connection_register_object (long connection, byte[] object_path, long interface_info, long [] vtable, long user_data, long user_data_free_func, long [] error) {
 	lock.lock();
 	try {
 		return _g_dbus_connection_register_object( connection,  object_path,  interface_info,  vtable,  user_data,  user_data_free_func, error);
@@ -4665,9 +4665,9 @@ public static final long g_variant_new_byte (byte value) {
  * @param length cast=(gsize)
  * @category gdbus
  */
-public static final native long _g_variant_new_tuple (long /*int*/[] items, long length);
+public static final native long _g_variant_new_tuple (long [] items, long length);
 /** @category gdbus */
-public static final long g_variant_new_tuple (long /*int*/[] items, long length ) {
+public static final long g_variant_new_tuple (long [] items, long length ) {
 	lock.lock();
 	try {
 		return _g_variant_new_tuple (items, length);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java
index 66152e29ea..a5c2a1d122 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/gtk/org/eclipse/swt/printing/Printer.java
@@ -262,7 +262,7 @@ static byte [] uriFromFilename(String filename) {
 	if (length == 0) return null;
 	char[] chars = new char[length];
 	filename.getChars(0, length, chars, 0);
-	long /*int*/[] error = new long /*int*/[1];
+	long [] error = new long [1];
 	long utf8Ptr = OS.g_utf16_to_utf8(chars, chars.length, null, null, error);
 	if (error[0] != 0 || utf8Ptr == 0) return null;
 	long localePtr = OS.g_filename_from_utf8(utf8Ptr, -1, null, null, error);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
index 985d6a9e97..da0f52bf1e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c
@@ -90,23 +90,23 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSContextGetGlobalObject)
 
 #ifndef NO__1JSEvaluateScript
 JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSEvaluateScript)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jintLongArray arg5)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5)
 {
-	jintLong *lparg5=NULL;
+	jlong *lparg5=NULL;
 	jlong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSEvaluateScript_FUNC);
-	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
 /*
 	rc = (jlong)JSEvaluateScript(arg0, arg1, arg2, arg3, arg4, lparg5);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSEvaluateScript)
 		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong, jint, jlong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5);
 		}
 	}
 fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
+	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSEvaluateScript_FUNC);
 	return rc;
 }
@@ -134,23 +134,23 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPrivate)
 
 #ifndef NO__1JSObjectGetProperty
 JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectGetProperty)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jintLongArray arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlongArray arg3)
 {
-	jintLong *lparg3=NULL;
+	jlong *lparg3=NULL;
 	jlong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetProperty_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	rc = (jlong)JSObjectGetProperty(arg0, arg1, arg2, lparg3);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetProperty)
 		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong, jintLong *))fp)(arg0, arg1, arg2, lparg3);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong *))fp)(arg0, arg1, arg2, lparg3);
 		}
 	}
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetProperty_FUNC);
 	return rc;
 }
@@ -158,23 +158,23 @@ fail:
 
 #ifndef NO__1JSObjectGetPropertyAtIndex
 JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPropertyAtIndex)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jintLongArray arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jlongArray arg3)
 {
-	jintLong *lparg3=NULL;
+	jlong *lparg3=NULL;
 	jlong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPropertyAtIndex_FUNC);
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	rc = (jlong)JSObjectGetPropertyAtIndex(arg0, arg1, arg2, lparg3);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPropertyAtIndex)
 		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jint, jlong *))fp)(arg0, arg1, arg2, lparg3);
 		}
 	}
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetPropertyAtIndex_FUNC);
 	return rc;
 }
@@ -202,26 +202,26 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectMake)
 
 #ifndef NO__1JSObjectMakeArray
 JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeArray)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3)
 {
-	jintLong *lparg2=NULL;
-	jintLong *lparg3=NULL;
+	jlong *lparg2=NULL;
+	jlong *lparg3=NULL;
 	jlong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMakeArray_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	rc = (jlong)JSObjectMakeArray(arg0, arg1, lparg2, lparg3);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeArray)
 		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jintLong *, jintLong *))fp)(arg0, arg1, lparg2, lparg3);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong *, jlong *))fp)(arg0, arg1, lparg2, lparg3);
 		}
 	}
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMakeArray_FUNC);
 	return rc;
 }
@@ -249,22 +249,22 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeFunctionWithCallback)
 
 #ifndef NO__1JSObjectSetProperty
 JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSObjectSetProperty)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jintLongArray arg5)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5)
 {
-	jintLong *lparg5=NULL;
+	jlong *lparg5=NULL;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectSetProperty_FUNC);
-	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
 /*
 	JSObjectSetProperty(arg0, arg1, arg2, arg3, arg4, lparg5);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSObjectSetProperty)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5);
+			((void (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong, jint, jlong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5);
 		}
 	}
 fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
+	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectSetProperty_FUNC);
 }
 #endif
@@ -521,23 +521,23 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSValueMakeUndefined)
 
 #ifndef NO__1JSValueToNumber
 JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1JSValueToNumber)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2)
 {
-	jintLong *lparg2=NULL;
+	jlong *lparg2=NULL;
 	jdouble rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToNumber_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 = (jdouble)JSValueToNumber(arg0, arg1, lparg2);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSValueToNumber)
 		if (fp) {
-			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jlong, jlong, jintLong *))fp)(arg0, arg1, lparg2);
+			rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jlong, jlong, jlong *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSValueToNumber_FUNC);
 	return rc;
 }
@@ -545,23 +545,23 @@ fail:
 
 #ifndef NO__1JSValueToStringCopy
 JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSValueToStringCopy)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2)
 {
-	jintLong *lparg2=NULL;
+	jlong *lparg2=NULL;
 	jlong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToStringCopy_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 = (jlong)JSValueToStringCopy(arg0, arg1, lparg2);
 */
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, JSValueToStringCopy)
 		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jintLong *))fp)(arg0, arg1, lparg2);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong *))fp)(arg0, arg1, lparg2);
 		}
 	}
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 	WebKitGTK_NATIVE_EXIT(env, that, _1JSValueToStringCopy_FUNC);
 	return rc;
 }
@@ -2694,13 +2694,13 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data)
 
 #ifndef NO__1webkit_1web_1resource_1get_1data_1finish
 JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data_1finish)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jlongArray arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jlongArray arg3)
 {
-	jintLong *lparg2=NULL;
+	jlong *lparg2=NULL;
 	jlong *lparg3=NULL;
 	jlong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1resource_1get_1data_1finish_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;
 	if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail;
 /*
 	rc = (jlong)webkit_web_resource_get_data_finish(arg0, arg1, lparg2, lparg3);
@@ -2708,12 +2708,12 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data_1fin
 	{
 		WebKitGTK_LOAD_FUNCTION(fp, webkit_web_resource_get_data_finish)
 		if (fp) {
-			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jintLong *, jlong *))fp)(arg0, arg1, lparg2, lparg3);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong *, jlong *))fp)(arg0, arg1, lparg2, lparg3);
 		}
 	}
 fail:
 	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1resource_1get_1data_1finish_FUNC);
 	return rc;
 }
@@ -3303,12 +3303,12 @@ fail:
 
 #ifndef NO__1webkit_1web_1view_1run_1javascript_1finish
 JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1run_1javascript_1finish)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2)
 {
-	jintLong *lparg2=NULL;
+	jlong *lparg2=NULL;
 	jlong rc = 0;
 	WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1run_1javascript_1finish_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 = (jlong)webkit_web_view_run_javascript_finish(arg0, arg1, (GError **)lparg2);
 */
@@ -3319,7 +3319,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1run_1javascript_1f
 		}
 	}
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
 	WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1run_1javascript_1finish_FUNC);
 	return rc;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
index 9491018625..84ffab7f63 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
@@ -617,7 +617,7 @@ class WebKit extends WebBrowser {
 			assert cb_args.length == 4;
 			Object returnValue = null;
 			Long webViewLocal = (Double.valueOf((String) cb_args[0])).longValue();
-			Browser browser = FindBrowser((long /*int*/) webViewLocal.longValue());
+			Browser browser = FindBrowser((long ) webViewLocal.longValue());
 			Integer functionIndex = ((Double) cb_args[1]).intValue();
 			String token = (String) cb_args[2];
 
@@ -724,7 +724,7 @@ static long JSObjectCallAsFunctionProc (long ctx, long function, long thisObject
 		return WebKitGTK.JSValueMakeUndefined (ctx);
 	}
 	long ptr = WebKitGTK.JSObjectGetPrivate (thisObject);
-	long /*int*/[] handle = new long /*int*/[1];
+	long [] handle = new long [1];
 	C.memmove (handle, ptr, C.PTR_SIZEOF);
 	Browser browser = FindBrowser (handle[0]);
 	if (browser == null) return 0;
@@ -1163,7 +1163,7 @@ public void create (Composite parent, int style) {
 
 	if (WEBKIT1) {
 		webViewData = C.malloc (C.PTR_SIZEOF);
-		C.memmove (webViewData, new long /*int*/[] {webView}, C.PTR_SIZEOF);
+		C.memmove (webViewData, new long [] {webView}, C.PTR_SIZEOF);
 	}
 
 	// Documentation for these signals/properties is usually found under signal/property of WebKitWebView.
@@ -1813,7 +1813,7 @@ private static class Webkit2AsyncToSync {
 		Webkit2AsyncReturnObj retObj = CallBackMap.getObj(callbackId);
 
 		if (retObj != null) { // retObj can be null if there was a timeout.
-			long /*int*/[] gerror = new long [1]; // GError **
+			long [] gerror = new long [1]; // GError **
 			long js_result = WebKitGTK.webkit_web_view_run_javascript_finish(GObject_source, GAsyncResult, gerror);
 			if (js_result == 0) {
 				long errMsg = OS.g_error_get_message(gerror[0]);
@@ -1865,8 +1865,8 @@ private static class Webkit2AsyncToSync {
 		int callbackId = (int) user_data;
 		Webkit2AsyncReturnObj retObj = CallBackMap.getObj(callbackId);
 
-		long /*int*/[] gsize_len = new long [1];
-		long /*int*/[] gerrorRes = new long [1]; // GError **
+		long [] gsize_len = new long [1];
+		long [] gerrorRes = new long [1]; // GError **
 		long guchar_data = WebKitGTK.webkit_web_resource_get_data_finish(WebResource, GAsyncResult, gsize_len, gerrorRes);
 		if (gerrorRes[0] != 0 || guchar_data == 0) {
 			OS.g_error_free(gerrorRes[0]);
@@ -3862,7 +3862,7 @@ long callJava (long ctx, long func, long thisObject, long argumentCount, long ar
 	if (argumentCount == 3) {
 		// Javastring array: <int: function index>, <string: token>, <array: javascript args>
 		// 1st arg: Function index
-		long /*int*/[] result = new long /*int*/[1];
+		long [] result = new long [1];
 		C.memmove (result, arguments, C.PTR_SIZEOF);
 		int type = WebKitGTK.JSValueGetType (ctx, result[0]);
 		if (type == WebKitGTK.kJSTypeNumber) {
@@ -3923,7 +3923,7 @@ long convertToJS (long ctx, Object value) {
 	if (value instanceof Object[]) {
 		Object[] arrayValue = (Object[]) value;
 		int length = arrayValue.length;
-		long /*int*/[] arguments = new long /*int*/[length];
+		long [] arguments = new long [length];
 		for (int i = 0; i < length; i++) {
 			Object javaObject = arrayValue[i];
 			long jsObject = convertToJS (ctx, javaObject);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java
index f931db5cc8..1d2d9edae9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java
@@ -300,7 +300,7 @@ class WebkitGDBus {
 
 	@SuppressWarnings("unused")
 	private static long callExtensionAsyncCallback (long source_object, long res, long user_data) {
-		long /*int*/[] gerror = new long /*int*/[1];
+		long [] gerror = new long [1];
 		long result = OS.g_dbus_proxy_call_finish (proxy, res, gerror);
 		if (gerror[0] != 0){
 			long errMsg = OS.g_error_get_message(gerror[0]);
@@ -436,7 +436,7 @@ class WebkitGDBus {
 	 * @return an Object representing the return value from DBus in boolean form
 	 */
 	static Object callExtensionSync (long params, String methodName) {
-		long /*int*/[] gerror = new long [1]; // GError **
+		long [] gerror = new long [1]; // GError **
 		long gVariant = OS.g_dbus_proxy_call_sync(proxy, Converter.javaStringToCString(methodName),
 				params, OS.G_DBUS_CALL_FLAGS_NO_AUTO_START, 1000, 0, gerror);
 		if (gerror[0] != 0) {
@@ -472,7 +472,7 @@ class WebkitGDBus {
 	 * @return true if the extension was called without errors, false otherwise
 	 */
 	static boolean callExtensionAsync (long params, String methodName) {
-		long /*int*/[] gerror = new long [1]; // GError **
+		long [] gerror = new long [1]; // GError **
 		OS.g_dbus_proxy_call(proxy, Converter.javaStringToCString(methodName),
 				params, OS.G_DBUS_CALL_FLAGS_NO_AUTO_START, 1000, 0, callExtensionAsyncCallback.getAddress(), gerror);
 		if (gerror[0] != 0) {
@@ -599,7 +599,7 @@ class WebkitGDBus {
 				return OS.g_variant_new_byte(WebkitGDBus.SWT_DBUS_MAGIC_NUMBER_EMPTY_ARRAY);  // see: WebKitGTK.java 'TYPE NOTES'
 			}
 
-			long variants[] = new long /*int*/[length];
+			long variants[] = new long [length];
 
 			for (int i = 0; i < length; i++) {
 				variants[i] = convertJavaToGVariant(arrayValue[i]);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
index 92a7ba78bf..ba0247e395 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java
@@ -265,8 +265,8 @@ public static final long JSContextGetGlobalObject (long ctx) {
 }
 
 /** @method flags=dynamic */
-public static final native long _JSEvaluateScript (long ctx, long script, long thisObject, long sourceURL, int startingLineNumber, long /*int*/[] exception);
-public static final long JSEvaluateScript (long ctx, long script, long thisObject, long sourceURL, int startingLineNumber, long /*int*/[] exception) {
+public static final native long _JSEvaluateScript (long ctx, long script, long thisObject, long sourceURL, int startingLineNumber, long [] exception);
+public static final long JSEvaluateScript (long ctx, long script, long thisObject, long sourceURL, int startingLineNumber, long [] exception) {
 	lock.lock();
 	try {
 		return _JSEvaluateScript (ctx, script, thisObject, sourceURL, startingLineNumber, exception);
@@ -287,8 +287,8 @@ public static final long JSObjectGetPrivate (long object) {
 }
 
 /** @method flags=dynamic */
-public static final native long _JSObjectGetProperty (long ctx, long object, long propertyName, long /*int*/[] exception);
-public static final long JSObjectGetProperty (long ctx, long object, long propertyName, long /*int*/[] exception) {
+public static final native long _JSObjectGetProperty (long ctx, long object, long propertyName, long [] exception);
+public static final long JSObjectGetProperty (long ctx, long object, long propertyName, long [] exception) {
 	lock.lock();
 	try {
 		return _JSObjectGetProperty (ctx, object, propertyName, exception);
@@ -298,8 +298,8 @@ public static final long JSObjectGetProperty (long ctx, long object, long proper
 }
 
 /** @method flags=dynamic */
-public static final native long _JSObjectGetPropertyAtIndex (long ctx, long object, int propertyIndex, long /*int*/[] exception);
-public static final long JSObjectGetPropertyAtIndex (long ctx, long object, int propertyIndex, long /*int*/[] exception) {
+public static final native long _JSObjectGetPropertyAtIndex (long ctx, long object, int propertyIndex, long [] exception);
+public static final long JSObjectGetPropertyAtIndex (long ctx, long object, int propertyIndex, long [] exception) {
 	lock.lock();
 	try {
 		return _JSObjectGetPropertyAtIndex (ctx, object, propertyIndex, exception);
@@ -320,8 +320,8 @@ public static final long JSObjectMake (long ctx, long jsClass, long data) {
 }
 
 /** @method flags=dynamic */
-public static final native long _JSObjectMakeArray (long ctx, long argumentCount, long /*int*/[] arguments, long /*int*/[] exception);
-public static final long JSObjectMakeArray (long ctx, long argumentCount, long /*int*/[] arguments, long /*int*/[] exception) {
+public static final native long _JSObjectMakeArray (long ctx, long argumentCount, long [] arguments, long [] exception);
+public static final long JSObjectMakeArray (long ctx, long argumentCount, long [] arguments, long [] exception) {
 	lock.lock();
 	try {
 		return _JSObjectMakeArray (ctx, argumentCount, arguments, exception);
@@ -342,8 +342,8 @@ public static final long JSObjectMakeFunctionWithCallback (long ctx, long name,
 }
 
 /** @method flags=dynamic */
-public static final native void _JSObjectSetProperty (long ctx, long object, long propertyName, long value, int attributes, long /*int*/[] exception);
-public static final void JSObjectSetProperty (long ctx, long object, long propertyName, long value, int attributes, long /*int*/[] exception) {
+public static final native void _JSObjectSetProperty (long ctx, long object, long propertyName, long value, int attributes, long [] exception);
+public static final void JSObjectSetProperty (long ctx, long object, long propertyName, long value, int attributes, long [] exception) {
 	lock.lock();
 	try {
 		_JSObjectSetProperty (ctx, object, propertyName, value, attributes, exception);
@@ -499,8 +499,8 @@ public static final long JSValueMakeUndefined (long ctx) {
 }
 
 /** @method flags=dynamic */
-public static final native double _JSValueToNumber (long ctx, long value, long /*int*/[] exception);
-public static final double JSValueToNumber (long ctx, long value, long /*int*/[] exception) {
+public static final native double _JSValueToNumber (long ctx, long value, long [] exception);
+public static final double JSValueToNumber (long ctx, long value, long [] exception) {
 	lock.lock();
 	try {
 		return _JSValueToNumber (ctx, value, exception);
@@ -510,8 +510,8 @@ public static final double JSValueToNumber (long ctx, long value, long /*int*/[]
 }
 
 /** @method flags=dynamic */
-public static final native long _JSValueToStringCopy (long ctx, long value, long /*int*/[] exception);
-public static final long JSValueToStringCopy (long ctx, long value, long /*int*/[] exception) {
+public static final native long _JSValueToStringCopy (long ctx, long value, long [] exception);
+public static final long JSValueToStringCopy (long ctx, long value, long [] exception) {
 	lock.lock();
 	try {
 		return _JSValueToStringCopy (ctx, value, exception);
@@ -2029,8 +2029,8 @@ public static final void webkit_web_resource_get_data (long webKitWebResource, l
 }
 
 /** @method flags=dynamic */
-public static final native long _webkit_web_resource_get_data_finish(long WebKitWebResource, long GAsyncResult, long /*int*/[] gsize, long GError[]);
-public static final long webkit_web_resource_get_data_finish(long WebKitWebResource, long GAsyncResult, long /*int*/[] gsize, long GError[]) {
+public static final native long _webkit_web_resource_get_data_finish(long WebKitWebResource, long GAsyncResult, long [] gsize, long GError[]);
+public static final long webkit_web_resource_get_data_finish(long WebKitWebResource, long GAsyncResult, long [] gsize, long GError[]) {
 	assert WEBKIT2 : Webkit2AssertMsg;
 	lock.lock();
 	try {
@@ -2045,9 +2045,9 @@ public static final long webkit_web_resource_get_data_finish(long WebKitWebResou
  * @method flags=dynamic
  * @param gerror cast=(GError **)
  */
-public static final native long _webkit_web_view_run_javascript_finish(long web_view, long GAsyncResult, long /*int*/[] gerror);
+public static final native long _webkit_web_view_run_javascript_finish(long web_view, long GAsyncResult, long [] gerror);
 /**WebKitJavascriptResult * webkit_web_view_run_javascript_finish (WebKitWebView *web_view, GAsyncResult *result, GError **error);*/
-public static long webkit_web_view_run_javascript_finish(long web_view, long GAsyncResult, long /*int*/[] gerror) {
+public static long webkit_web_view_run_javascript_finish(long web_view, long GAsyncResult, long [] gerror) {
 	assert WEBKIT2 : Webkit2AssertMsg;
 	lock.lock();
 	try {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java
index 50917b4ea0..f46baba95d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java
@@ -48,7 +48,7 @@ public interface Drawable {
  * @noreference This method is not intended to be referenced by clients.
  */
 
-long /*int*/ internal_new_GC (GCData data);
+long  internal_new_GC (GCData data);
 
 /**
  * Invokes platform specific functionality to dispose a GC handle.
@@ -65,7 +65,7 @@ long /*int*/ internal_new_GC (GCData data);
  *
  * @noreference This method is not intended to be referenced by clients.
  */
-void internal_dispose_GC (long /*int*/ handle, GCData data);
+void internal_dispose_GC (long  handle, GCData data);
 
 /**
  * Returns <code>true</code> iff coordinates can be auto-scaled on this
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
index fe4f23b8a7..66f7982e39 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
@@ -418,11 +418,11 @@ public Point getDPI () {
 public FontData[] getFontList (String faceName, boolean scalable) {
 	checkDevice ();
 	if (!scalable) return new FontData[0];
-	long /*int*/[] family = new long /*int*/[1];
-	long /*int*/[] face = new long /*int*/[1];
-	long /*int*/[] families = new long /*int*/[1];
+	long [] family = new long [1];
+	long [] face = new long [1];
+	long [] families = new long [1];
 	int[] n_families = new int[1];
-	long /*int*/[] faces = new long /*int*/[1];
+	long [] faces = new long [1];
 	int[] n_faces = new int[1];
 	long context;
 	if (GTK.GTK4) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
index 93f253915a..14c4d64d9a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java
@@ -398,7 +398,7 @@ long convertRgn(long rgn, double[] matrix) {
 		return newRgn;
 	}
 	int[] nRects = new int[1];
-	long /*int*/[] rects = new long /*int*/[1];
+	long [] rects = new long [1];
 	Region.cairo_region_get_rectangles(rgn, rects, nRects);
 	cairo_rectangle_int_t rect = new cairo_rectangle_int_t ();
 	int[] pointArray = new int[8];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java
index 74495a3e00..3f5e472de7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Region.java
@@ -129,7 +129,7 @@ static long gdk_region_polygon(int[] pointArray, int npoints, int fill_rule) {
 	return polyRgn;
 }
 
-static void cairo_region_get_rectangles(long region, long /*int*/[] rectangles, int[] n_rectangles) {
+static void cairo_region_get_rectangles(long region, long [] rectangles, int[] n_rectangles) {
 	int num = Cairo.cairo_region_num_rectangles (region);
 	if (n_rectangles != null) n_rectangles[0] = num;
 	rectangles[0] = OS.g_malloc(cairo_rectangle_int_t.sizeof * num);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
index 0a874f8b6d..a1c0692119 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
@@ -476,7 +476,7 @@ void drawInPixels(GC gc, int x, int y, int selectionStart, int selectionEnd, Col
 	GCData data = gc.data;
 	long cairo = data.cairo;
 	if ((flags & (SWT.FULL_SELECTION | SWT.DELIMITER_SELECTION)) != 0 && (hasSelection || (flags & SWT.LAST_LINE_SELECTION) != 0)) {
-		long /*int*/[] attrs = new long /*int*/[1];
+		long [] attrs = new long [1];
 		int[] nAttrs = new int[1];
 		PangoLogAttr logAttr = new PangoLogAttr();
 		PangoRectangle rect = new PangoRectangle();
@@ -636,7 +636,7 @@ void drawBorder(GC gc, int x, int y, GdkRGBA selectionColor) {
 			long rgn = GDK.gdk_pango_layout_get_clip_region(layout, x, y, ranges, ranges.length / 2);
 			if (rgn != 0) {
 				int[] nRects = new int[1];
-				long /*int*/[] rects = new long /*int*/[1];
+				long [] rects = new long [1];
 				Region.cairo_region_get_rectangles(rgn, rects, nRects);
 				cairo_rectangle_int_t rect = new cairo_rectangle_int_t();
 				GdkRGBA colorRGBA = null;
@@ -1196,7 +1196,7 @@ int _getOffset (int offset, int movement, boolean forward) {
 	}
 	int step = forward ? 1 : -1;
 	if ((movement & SWT.MOVEMENT_CHAR) != 0) return offset + step;
-	long /*int*/[] attrs = new long /*int*/[1];
+	long [] attrs = new long [1];
 	int[] nAttrs = new int[1];
 	OS.pango_layout_get_log_attrs(layout, attrs, nAttrs);
 	if (attrs[0] == 0) return offset + step;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java
index e9db1c6bb7..6c118f8d35 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/internal/GDBus.java
@@ -426,7 +426,7 @@ public class GDBus {
 			Object[] arrayValue = (Object[]) javaObject;
 			int length = arrayValue.length;
 
-			long variants[] = new long /*int*/[length];
+			long variants[] = new long [length];
 			for (int i = 0; i < length; i++) {
 				variants[i] = convertJavaToGVariant(arrayValue[i]);
 			}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
index dfd7391478..b842510a02 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java
@@ -981,7 +981,7 @@ private void gtk_swt_set_border_color (GdkRGBA rgba) {
 	}
 
 	// Apply the CSS
-	long /*int*/context = GTK.gtk_widget_get_style_context (handle);
+	long context = GTK.gtk_widget_get_style_context (handle);
 	gtk_css_provider_load_from_css (context, finalCss);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
index 6a2d5384da..48e7fa637f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
@@ -2263,7 +2263,7 @@ void setButtonHandle (long widget) {
 	if (buttonHandle != 0) {
 		OS.g_object_ref (buttonHandle);
 		display.addWidget (buttonHandle, this);
-		hookEvents (new long /*int*/[]{buttonHandle});
+		hookEvents (new long []{buttonHandle});
 	}
 }
 
@@ -2277,7 +2277,7 @@ void setMenuHandle (long widget) {
 	if (menuHandle != 0) {
 		OS.g_object_ref (menuHandle);
 		display.addWidget (menuHandle, this);
-		hookEvents (new long /*int*/[]{menuHandle});
+		hookEvents (new long []{menuHandle});
 	}
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
index abed41f598..ce3ef2eb3b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java
@@ -1183,7 +1183,7 @@ private int findLatinKeyGroup () {
 
 	// count all key groups for Latin alphabet
 	for (int keyval = GDK.GDK_KEY_a; keyval <= GDK.GDK_KEY_z; keyval++) {
-		long /*int*/[] keys = new long /*int*/[1];
+		long [] keys = new long [1];
 		int [] n_keys = new int [1];
 
 		if (GDK.gdk_keymap_get_entries_for_keyval (keymap, keyval, keys, n_keys)) {
@@ -1737,7 +1737,7 @@ public Control getCursorControl () {
 			GDK.gdk_x11_display_error_trap_push(gdkDisplay);
 		}
 		int[] unusedInt = new int[1];
-		long /*int*/[] unusedPtr = new long /*int*/[1], buffer = new long /*int*/[1];
+		long [] unusedPtr = new long [1], buffer = new long [1];
 		long xWindow, xParent = OS.XDefaultRootWindow (xDisplay);
 		do {
 			if (OS.XQueryPointer (xDisplay, xParent, unusedPtr, buffer, unusedInt, unusedInt, unusedInt, unusedInt, unusedInt) == 0) {
@@ -2674,10 +2674,10 @@ Rectangle getWorkArea() {
 	byte[] name = Converter.wcsToMbcs ("_NET_WORKAREA", true); //$NON-NLS-1$
 	long atom = GDK.gdk_atom_intern (name, true);
 	if (atom == GDK.GDK_NONE) return null;
-	long /*int*/[] actualType = new long /*int*/[1];
+	long [] actualType = new long [1];
 	int[] actualFormat = new int[1];
 	int[] actualLength = new int[1];
-	long /*int*/[] data = new long /*int*/[1];
+	long [] data = new long [1];
 	if (!GDK.gdk_property_get (GDK.gdk_get_default_root_window(), atom, GDK.GDK_NONE, 0, 16, 0, actualType, actualFormat, actualLength, data)) {
 		return null;
 	}
@@ -4549,7 +4549,7 @@ public boolean post (Event event) {
 					int raw_keyval = untranslateKey(event.keyCode);
 					if (raw_keyval == 0) raw_keyval = event.character;
 
-					long /*int*/[] keys_list = new long [1];
+					long [] keys_list = new long [1];
 					int [] n_keys = new int [1];
 					int [] keyval = new int [1], effective_group = new int [1], level = new int [1], consumed_modifiers = new int[1];
 					int final_keyval = raw_keyval;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
index 8c53662fc8..b4fb19890f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
@@ -2612,7 +2612,7 @@ public void setRegion (Region region) {
 }
 
 //copied from Region:
-static void gdk_region_get_rectangles(long region, long /*int*/[] rectangles, int[] n_rectangles) {
+static void gdk_region_get_rectangles(long region, long [] rectangles, int[] n_rectangles) {
 	int num = Cairo.cairo_region_num_rectangles (region);
 	if (n_rectangles != null) n_rectangles[0] = num;
 	rectangles[0] = OS.g_malloc(GdkRectangle.sizeof * num);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
index 3b5da88772..66a1047331 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
@@ -539,7 +539,7 @@ void createColumn (TableColumn column, int index) {
 		}
 		if (modelIndex == modelLength) {
 			long oldModel = modelHandle;
-			long /*int*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time
+			long [] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time
 			long newModel = GTK.gtk_list_store_newv (types.length, types);
 			if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
 			long [] ptr = new long [1];
@@ -992,7 +992,7 @@ void destroyItem (TableColumn column) {
 	GTK.gtk_tree_view_remove_column (handle, columnHandle);
 	if (columnCount == 0) {
 		long oldModel = modelHandle;
-		long /*int*/[] types = getColumnTypes (1);
+		long [] types = getColumnTypes (1);
 		long newModel = GTK.gtk_list_store_newv (types.length, types);
 		if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
 		long [] ptr = new long [1];
@@ -1055,11 +1055,11 @@ void destroyItem (TableColumn column) {
 			if (item != null) {
 				long iter = item.handle;
 				int modelIndex = column.modelIndex;
-				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, (long /*int*/)0, -1);
-				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_TEXT, (long /*int*/)0, -1);
-				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (long /*int*/)0, -1);
-				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (long /*int*/)0, -1);
-				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_FONT, (long /*int*/)0, -1);
+				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, (long )0, -1);
+				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_TEXT, (long )0, -1);
+				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (long )0, -1);
+				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (long )0, -1);
+				GTK.gtk_list_store_set (modelHandle, iter, modelIndex + CELL_FONT, (long )0, -1);
 
 				Font [] cellFont = item.cellFont;
 				if (cellFont != null) {
@@ -1279,8 +1279,8 @@ public int getColumnCount () {
 	return columnCount;
 }
 
-long /*int*/[] getColumnTypes (int columnCount) {
-	long /*int*/[] types = new long [FIRST_COLUMN + (columnCount * CELL_TYPES)];
+long [] getColumnTypes (int columnCount) {
+	long [] types = new long [FIRST_COLUMN + (columnCount * CELL_TYPES)];
 	// per row data
 	types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
 	types [GRAYED_COLUMN] = OS.G_TYPE_BOOLEAN ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java
index 19b0a04428..1316029d95 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableItem.java
@@ -224,7 +224,7 @@ void clear () {
 			GTK.gtk_list_store_set (parent.modelHandle, handle, i, 0, -1);
 		}
 		for (int i=Table.FOREGROUND_COLUMN; i<columnCount; i++) {
-			GTK.gtk_list_store_set (parent.modelHandle, handle, i, (long /*int*/)0, -1);
+			GTK.gtk_list_store_set (parent.modelHandle, handle, i, (long )0, -1);
 		}
 	}
 	cached = false;
@@ -1216,7 +1216,7 @@ public void setImage (int index, Image image) {
 			}
 		}
 	}
-	long /*int*/parentHandle = parent.handle;
+	long parentHandle = parent.handle;
 	long column = GTK.gtk_tree_view_get_column (parentHandle, index);
 	long pixbufRenderer = parent.getPixbufRenderer (column);
 	int [] currentWidth = new int [1];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
index 1aeafeecb0..e1f11716cc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
@@ -731,10 +731,10 @@ void createColumn (TreeColumn column, int index) {
 		}
 		if (modelIndex == modelLength) {
 			long oldModel = modelHandle;
-			long /*int*/[] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time
+			long [] types = getColumnTypes (columnCount + 4); // grow by 4 rows at a time
 			long newModel = GTK.gtk_tree_store_newv (types.length, types);
 			if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
-			copyModel (oldModel, FIRST_COLUMN, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, modelLength);
+			copyModel (oldModel, FIRST_COLUMN, newModel, FIRST_COLUMN, types, (long )0, (long )0, modelLength);
 			GTK.gtk_tree_view_set_model (handle, newModel);
 			setModel (newModel);
 		}
@@ -1096,10 +1096,10 @@ void destroyItem (TreeColumn column) {
 	GTK.gtk_tree_view_remove_column (handle, columnHandle);
 	if (columnCount == 0) {
 		long oldModel = modelHandle;
-		long /*int*/[] types = getColumnTypes (1);
+		long [] types = getColumnTypes (1);
 		long newModel = GTK.gtk_tree_store_newv (types.length, types);
 		if (newModel == 0) error (SWT.ERROR_NO_HANDLES);
-		copyModel(oldModel, column.modelIndex, newModel, FIRST_COLUMN, types, (long /*int*/)0, (long /*int*/)0, FIRST_COLUMN + CELL_TYPES);
+		copyModel(oldModel, column.modelIndex, newModel, FIRST_COLUMN, types, (long )0, (long )0, FIRST_COLUMN + CELL_TYPES);
 		GTK.gtk_tree_view_set_model (handle, newModel);
 		setModel (newModel);
 		createColumn (null, 0);
@@ -1109,11 +1109,11 @@ void destroyItem (TreeColumn column) {
 			if (item != null) {
 				long iter = item.handle;
 				int modelIndex = column.modelIndex;
-				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, (long /*int*/)0, -1);
-				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_TEXT, (long /*int*/)0, -1);
-				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (long /*int*/)0, -1);
-				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (long /*int*/)0, -1);
-				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FONT, (long /*int*/)0, -1);
+				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_PIXBUF, (long )0, -1);
+				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_TEXT, (long )0, -1);
+				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FOREGROUND, (long )0, -1);
+				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_BACKGROUND, (long )0, -1);
+				GTK.gtk_tree_store_set (modelHandle, iter, modelIndex + CELL_FONT, (long )0, -1);
 
 				Font [] cellFont = item.cellFont;
 				if (cellFont != null) {
@@ -1380,8 +1380,8 @@ public int [] getColumnOrder () {
 	return order;
 }
 
-long /*int*/[] getColumnTypes (int columnCount) {
-	long /*int*/[] types = new long [FIRST_COLUMN + (columnCount * CELL_TYPES)];
+long [] getColumnTypes (int columnCount) {
+	long [] types = new long [FIRST_COLUMN + (columnCount * CELL_TYPES)];
 	// per row data
 	types [ID_COLUMN] = OS.G_TYPE_INT ();
 	types [CHECKED_COLUMN] = OS.G_TYPE_BOOLEAN ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
index 273436bfb3..7c9d627b64 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeItem.java
@@ -305,7 +305,7 @@ void clear () {
 			GTK.gtk_tree_store_set (parent.modelHandle, handle, i, 0, -1);
 		}
 		for (int i=Tree.FOREGROUND_COLUMN; i<columnCount; i++) {
-			GTK.gtk_tree_store_set (parent.modelHandle, handle, i, (long /*int*/)0, -1);
+			GTK.gtk_tree_store_set (parent.modelHandle, handle, i, (long )0, -1);
 		}
 	}
 	cached = false;
@@ -1555,7 +1555,7 @@ public void setImage (int index, Image image) {
 			}
 		}
 	}
-	long /*int*/parentHandle = parent.handle;
+	long parentHandle = parent.handle;
 	long column = GTK.gtk_tree_view_get_column (parentHandle, index);
 	long pixbufRenderer = parent.getPixbufRenderer (column);
 	int [] currentWidth = new int [1];