Bug 546768 - [Cocoa] Remove 32-bit code

Part 2 of 32-bit removal patch set.

* Run the automated 32-bit annotation removal script.
(Attached to the bug report).
* Run MacGenerator to strip some redundant casts.

Change-Id: I6534ea449e8f60b87f0da935bccf955b93a49279
Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>

249 files changed, 7114 insertions, 9923 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java b/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java
index b9f69a5938..4a5cb861dc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java
@@ -58,8 +58,8 @@ public class SWT_AWT {
 
 	static boolean loaded, swingInitialized;
 
-	static native final long /*int*/ getAWTHandle (Canvas canvas);
-	static native final Object initFrame (long /*int*/ handle, String className);
+	static native final long getAWTHandle (Canvas canvas);
+	static native final Object initFrame (long handle, String className);
 	static native final void validateWithBounds (Frame frame, int x, int y, int w, int h);
 	static native final void synthesizeWindowActivation (Frame frame, boolean doActivate);
 
@@ -137,7 +137,7 @@ public static Frame new_Frame(final Composite parent) {
 	if ((parent.getStyle() & SWT.EMBEDDED) == 0) {
 		SWT.error(SWT.ERROR_INVALID_ARGUMENT);
 	}
-	final long /*int*/ handle = parent.view.id;
+	final long handle = parent.view.id;
 	final String className = embeddedFrameClass != null ? embeddedFrameClass : JDK17_FRAME;
 	try {
 		if (embeddedFrameClass != null) {
@@ -311,7 +311,7 @@ public static Frame new_Frame(final Composite parent) {
 public static Shell new_Shell(final Display display, final Canvas parent) {
 	if (display == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
 	if (parent == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-	long /*int*/ handle = 0;
+	long handle = 0;
 
 	try {
 		loadLibrary ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
index 90b50e32d1..7197c0aecf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
@@ -150,7 +150,7 @@ public class Accessible {
 		if (accessible.delegate != null) return accessible.delegate;
 		if (accessible.control != null) {
 			NSView view = accessible.control.view;
-			long /*int*/ handle = OS.objc_msgSend(view.id, OS.sel_accessibleHandle);
+			long handle = OS.objc_msgSend(view.id, OS.sel_accessibleHandle);
 			return new id(handle);
 		}
 		return null;
@@ -444,9 +444,9 @@ public class Accessible {
 		accessibleAttributeListeners.add(listener);
 	}
 
-	void addCGColor(double /*float*/ [] comps, NSMutableAttributedString inAttribString, NSString inAttribute, NSRange inRange) {
-		long /*int*/ cgColorSpace = OS.CGColorSpaceCreateDeviceRGB();
-		long /*int*/ cgColor = OS.CGColorCreate(cgColorSpace, comps);
+	void addCGColor(double [] comps, NSMutableAttributedString inAttribString, NSString inAttribute, NSRange inRange) {
+		long cgColorSpace = OS.CGColorSpaceCreateDeviceRGB();
+		long cgColor = OS.CGColorCreate(cgColorSpace, comps);
 		OS.CGColorSpaceRelease(cgColorSpace);
 		inAttribString.addAttribute(inAttribute, new id(cgColor), inRange);
 	    OS.CGColorRelease(cgColor);
@@ -1608,7 +1608,7 @@ public class Accessible {
 
 		AccessibleTextAttributeEvent event = new AccessibleTextAttributeEvent(this);
 
-		event.offset = (int) /*64*/ range.location;
+		event.offset = (int) range.location;
 		event.start = event.end = -1;
 
 		NSRange attributeRange = new NSRange();
@@ -1653,7 +1653,7 @@ public class Accessible {
 					fontInfoDict.setValue(familyName, OS.NSAccessibilityFontFamilyKey);
 					NSString displayName = fontUsed.displayName();
 					fontInfoDict.setValue(displayName, OS.NSAccessibilityVisibleNameKey);
-					double /*float*/ fontSize = fontUsed.pointSize();
+					double fontSize = fontUsed.pointSize();
 					fontInfoDict.setValue(NSNumber.numberWithDouble(fontSize), OS.NSAccessibilityFontSizeKey);
 
 					attribString.addAttribute(OS.NSAccessibilityFontTextAttribute, fontInfoDict, attributeRange);
@@ -1753,8 +1753,8 @@ public class Accessible {
 		if (accessibleTextExtendedListenersSize() > 0) {
 			AccessibleTextEvent event  = new AccessibleTextEvent(this);
 			event.childID = childID;
-			event.start = (int)/*64*/range.location;
-			event.end = (int)/*64*/(range.location + range.length);
+			event.start = (int)range.location;
+			event.end = (int)(range.location + range.length);
 			for (int i = 0; i < accessibleTextExtendedListenersSize(); i++) {
 				AccessibleTextExtendedListener listener = accessibleTextExtendedListeners.get(i);
 				listener.getTextBounds(event);
@@ -2604,8 +2604,8 @@ public class Accessible {
 		if (accessibleTextExtendedListenersSize() > 0) {
 			AccessibleTextEvent event = new AccessibleTextEvent(this);
 			event.childID = childID;
-			event.start = (int) /*64*/ range.location;
-			event.end = (int) /*64*/ (range.location + range.length);
+			event.start = (int) range.location;
+			event.end = (int) (range.location + range.length);
 			event.type = ACC.TEXT_BOUNDARY_ALL;
 			for (int i = 0; i < accessibleTextExtendedListenersSize(); i++) {
 				AccessibleTextExtendedListener listener = accessibleTextExtendedListeners.get(i);
@@ -2623,7 +2623,7 @@ public class Accessible {
 			String appValue = event.result;
 
 			if (appValue != null) {
-				returnValue = NSString.stringWith(appValue.substring((int)/*64*/range.location, (int)/*64*/(range.location + range.length)));
+				returnValue = NSString.stringWith(appValue.substring((int)range.location, (int)(range.location + range.length)));
 			}
 		}
 		return returnValue;
@@ -2683,7 +2683,7 @@ public class Accessible {
 		int index = parameterObject.intValue();
 
 		AccessibleTextAttributeEvent event = new AccessibleTextAttributeEvent(this);
-		event.offset = (int) /*64*/ index;
+		event.offset = (int) index;
 
 		// Marker values -- if -1 after calling getTextAttributes, no one implemented it.
 		event.start = event.end = -1;
@@ -3345,8 +3345,8 @@ public class Accessible {
 
 		if (rangeObj != null) {
 			NSRange range = new NSValue(rangeObj).rangeValue();
-			rangeStart = (int)/*64*/range.location;
-			rangeEnd = (int)/*64*/(range.location + range.length);
+			rangeStart = (int)range.location;
+			rangeEnd = (int)(range.location + range.length);
 		}
 
 		if (accessibleEditableTextListenersSize() > 0) {
@@ -3578,7 +3578,7 @@ public class Accessible {
 	 *
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
-	public long /*int*/ internal_addRelationAttributes(long /*int*/ defaultAttributes) {
+	public long internal_addRelationAttributes(long defaultAttributes) {
 		NSArray attributes = new NSArray(defaultAttributes);
 		NSMutableArray returnArray = NSMutableArray.arrayWithCapacity(attributes.count());
 		returnArray.addObjectsFromArray(attributes);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/SWTAccessibleDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/SWTAccessibleDelegate.java
index 6b3c893148..7e8b9481d5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/SWTAccessibleDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/SWTAccessibleDelegate.java
@@ -31,10 +31,10 @@ class SWTAccessibleDelegate extends NSObject {
 	static final byte[] SWT_OBJECT = {'S', 'W', 'T', '_', 'O', 'B', 'J', 'E', 'C', 'T', '\0'};
 
 	static Callback accessible2Args, accessible3Args, accessible4Args;
-	static long /*int*/ proc2Args, proc3Args, proc4Args;
+	static long proc2Args, proc3Args, proc4Args;
 
 	Accessible accessible;
-	long /*int*/ delegateJniRef;
+	long delegateJniRef;
 	int childID;
 
 	NSArray attributeNames = null;
@@ -67,7 +67,7 @@ class SWTAccessibleDelegate extends NSObject {
 		byte[] types = {'*','\0'};
 		int size = C.PTR_SIZEOF, align = C.PTR_SIZEOF == 4 ? 2 : 3;
 
-		long /*int*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
+		long cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
 		OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
 
 		// Add the NSAccessibility overrides
@@ -176,7 +176,7 @@ class SWTAccessibleDelegate extends NSObject {
 		return new NSArray(temp2.id);
 	}
 
-	static long /*int*/ accessibleProc(long /*int*/ id, long /*int*/ sel) {
+	static long accessibleProc(long id, long sel) {
 		SWTAccessibleDelegate swtAcc = getAccessibleDelegate(id);
 		if (swtAcc == null) return 0;
 
@@ -200,7 +200,7 @@ class SWTAccessibleDelegate extends NSObject {
 		return 0;
 	}
 
-	static long /*int*/ accessibleProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+	static long accessibleProc(long id, long sel, long arg0) {
 		SWTAccessibleDelegate swtAcc = getAccessibleDelegate(id);
 		if (swtAcc == null) return 0;
 
@@ -228,7 +228,7 @@ class SWTAccessibleDelegate extends NSObject {
 		return 0;
 	}
 
-	static long /*int*/ accessibleProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+	static long accessibleProc(long id, long sel, long arg0, long arg1) {
 		SWTAccessibleDelegate swtAcc = getAccessibleDelegate(id);
 		if (swtAcc == null) return 0;
 
@@ -246,9 +246,9 @@ class SWTAccessibleDelegate extends NSObject {
 		return 0;
 	}
 
-	static SWTAccessibleDelegate getAccessibleDelegate(long /*int*/ id) {
+	static SWTAccessibleDelegate getAccessibleDelegate(long id) {
 		if (id == 0) return null;
-		long /*int*/ [] jniRef = new long /*int*/ [1];
+		long [] jniRef = new long [1];
 		OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
 		if (jniRef[0] == 0) return null;
 		return (SWTAccessibleDelegate)OS.JNIGetObject(jniRef[0]);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/ByteArrayTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/ByteArrayTransfer.java
index a0a38c9975..80a8018d39 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/ByteArrayTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/ByteArrayTransfer.java
@@ -180,7 +180,7 @@ protected Object nativeToJava(TransferData transferData) {
 	if (transferData.data == null) return null;
 	NSData data = (NSData) transferData.data;
 	if (data.length() == 0) return null;
-	byte[] bytes = new byte[(int)/*64*/data.length()];
+	byte[] bytes = new byte[(int)data.length()];
 	data.getBytes(bytes);
 	return bytes;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/Clipboard.java
index 567d2e5069..ffedb8f938 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/Clipboard.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/Clipboard.java
@@ -525,7 +525,7 @@ public TransferData[] getAvailableTypes(int clipboards) {
 	if (pasteboard == null) return new TransferData[0];
 	NSArray types = pasteboard.types();
 	if (types == null) return new TransferData[0];
-	int count = (int)/*64*/types.count();
+	int count = (int)types.count();
 	TransferData[] result = new TransferData[count];
 	for (int i = 0; i < count; i++) {
 		result[i] = new TransferData();
@@ -556,7 +556,7 @@ public String[] getAvailableTypeNames() {
 	if (pasteboard == null) return new String[0];
 	NSArray types = pasteboard.types();
 	if (types == null) return new String[0];
-	int count = (int)/*64*/types.count();
+	int count = (int)types.count();
 	String[] result = new String[count];
 	for (int i = 0; i < count; i++) {
 		result[i] = new NSString(types.objectAtIndex(i)).getString();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java
index 3a4b472907..f539698c57 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java
@@ -110,7 +110,7 @@ public class DragSource extends Widget {
 
 	static Callback dragSource2Args, dragSource3Args, dragSource4Args, dragSource5Args, dragSource6Args;
 	static final byte[] SWT_OBJECT = {'S', 'W', 'T', '_', 'O', 'B', 'J', 'E', 'C', 'T', '\0'};
-	static long /*int*/ proc2 = 0, proc3 = 0, proc4 = 0, proc5 = 0, proc6 = 0;
+	static long proc2 = 0, proc3 = 0, proc4 = 0, proc5 = 0, proc6 = 0;
 
 	String paths[];
 	boolean exist[];
@@ -140,10 +140,10 @@ public class DragSource extends Widget {
 		proc6 = dragSource6Args.getAddress();
 		if (proc6 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 
-		long /*int*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
+		long cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
 		OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
 
-		long /*int*/ draggedImage_endedAt_operationProc = OS.CALLBACK_draggedImage_endedAt_operation_(proc5);
+		long draggedImage_endedAt_operationProc = OS.CALLBACK_draggedImage_endedAt_operation_(proc5);
 
 		// Add the NSDraggingSource callbacks
 		OS.class_addMethod(cls, OS.sel_draggingSourceOperationMaskForLocal_, proc3, "@:I");
@@ -168,7 +168,7 @@ public class DragSource extends Widget {
 
 	static final String DEFAULT_DRAG_SOURCE_EFFECT = "DEFAULT_DRAG_SOURCE_EFFECT"; //$NON-NLS-1$
 
-	private long /*int*/ delegateJniRef;
+	private long delegateJniRef;
 	private Point dragOffset;
 
 /**
@@ -248,17 +248,17 @@ public DragSource(Control control, int style) {
 
 	// Tables and trees already implement dragging, so we need to override their drag methods instead of creating a dragging source.
 	if (control instanceof Tree || control instanceof Table) {
-		long /*int*/ cls = OS.object_getClass(control.view.id);
+		long cls = OS.object_getClass(control.view.id);
 
 		if (cls == 0) {
 			DND.error(DND.ERROR_CANNOT_INIT_DRAG);
 		}
 
 		// If we already added it, no need to do it again.
-		long /*int*/ procPtr = OS.class_getMethodImplementation(cls, OS.sel_draggingSourceOperationMaskForLocal_);
+		long procPtr = OS.class_getMethodImplementation(cls, OS.sel_draggingSourceOperationMaskForLocal_);
 		if (procPtr == proc3) return;
 
-		long /*int*/ draggedImage_endedAt_operationProc = OS.CALLBACK_draggedImage_endedAt_operation_(proc5);
+		long draggedImage_endedAt_operationProc = OS.CALLBACK_draggedImage_endedAt_operation_(proc5);
 
 		// Add the NSDraggingSource overrides.
 		OS.class_addMethod(cls, OS.sel_draggingSourceOperationMaskForLocal_, proc3, "@:I");
@@ -311,21 +311,21 @@ public void addDragListener(DragSourceListener listener) {
 	addListener (DND.DragEnd, typedListener);
 }
 
-void dndCallSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2) {
+void dndCallSuper(long id, long sel, long arg0, NSPoint arg1, long arg2) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, arg0, arg1, arg2);
 }
 
-void dndCallSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+void dndCallSuper(long id, long sel, long arg0, long arg1) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, arg0, arg1);
 }
 
-long /*int*/ dndCallSuperObject(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
+long dndCallSuperObject(long id, long sel, long arg0, long arg1, long arg2, long arg3) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -413,13 +413,13 @@ void dragOutlineViewStart(Event dragDetectEvent) {
 	dragOffset = new Point(event.offsetX, event.offsetY);
 }
 
-void draggedImage_beganAt(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+void draggedImage_beganAt(long id, long sel, long arg0, long arg1) {
 	if (new NSObject(id).isKindOfClass(OS.class_NSTableView)) {
 		dndCallSuper(id, sel, arg0, arg1);
 	}
 }
 
-void draggedImage_endedAt_operation(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2) {
+void draggedImage_endedAt_operation(long id, long sel, long arg0, NSPoint arg1, long arg2) {
 	int swtOperation = osOpToOp(arg2);
 	if (paths != null) {
 		NSFileManager fileManager = NSFileManager.defaultManager();
@@ -452,7 +452,7 @@ void draggedImage_endedAt_operation(long /*int*/ id, long /*int*/ sel, long /*in
 	}
 }
 
-long /*int*/ dragImageForRowsWithIndexes_tableColumns_event_offset(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
+long dragImageForRowsWithIndexes_tableColumns_event_offset(long id, long sel, long arg0, long arg1, long arg2, long arg3) {
 	if (dragImageFromListener != null) {
 		NSPoint point = new NSPoint();
 		point.x = dragOffset.x;
@@ -467,12 +467,12 @@ long /*int*/ dragImageForRowsWithIndexes_tableColumns_event_offset(long /*int*/
 /**
  * Cocoa NSDraggingSource implementations
  */
-long /*int*/ draggingSourceOperationMaskForLocal(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+long draggingSourceOperationMaskForLocal(long id, long sel, long arg0) {
 	// Drag operations are same for local or remote drags.
 	return dragOperations;
 }
 
-static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel) {
+static long dragSourceProc(long id, long sel) {
 	Display display = Display.findDisplay(Thread.currentThread());
 	if (display == null || display.isDisposed()) return 0;
 	Widget widget = display.findWidget(id);
@@ -494,7 +494,7 @@ static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel) {
 	return 0;
 }
 
-static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+static long dragSourceProc(long id, long sel, long arg0) {
 	Display display = Display.findDisplay(Thread.currentThread());
 	if (display == null || display.isDisposed()) return 0;
 	Widget widget = display.findWidget(id);
@@ -516,7 +516,7 @@ static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int
 	return 0;
 }
 
-static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+static long dragSourceProc(long id, long sel, long arg0, long arg1) {
 	Display display = Display.findDisplay(Thread.currentThread());
 	if (display == null || display.isDisposed()) return 0;
 	Widget widget = display.findWidget(id);
@@ -540,7 +540,7 @@ static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int
 	return 0;
 }
 
-static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
+static long dragSourceProc(long id, long sel, long arg0, long arg1, long arg2) {
 	Display display = Display.findDisplay(Thread.currentThread());
 	if (display == null || display.isDisposed()) return 0;
 	Widget widget = display.findWidget(id);
@@ -564,7 +564,7 @@ static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int
 	return 0;
 }
 
-static long /*int*/ dragSourceProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
+static long dragSourceProc(long id, long sel, long arg0, long arg1, long arg2, long arg3) {
 	Display display = Display.findDisplay(Thread.currentThread());
 	if (display == null || display.isDisposed()) return 0;
 	Widget widget = display.findWidget(id);
@@ -658,7 +658,7 @@ public Transfer[] getTransfer(){
 /**
  * We always want the modifier keys to potentially update the drag.
  */
-boolean ignoreModifierKeysWhileDragging(long /*int*/ id, long /*int*/ sel) {
+boolean ignoreModifierKeysWhileDragging(long id, long sel) {
 	return false;
 }
 
@@ -701,7 +701,7 @@ int opToOsOp(int operation) {
 	return osOperation;
 }
 
-int osOpToOp(long /*int*/ osOperation){
+int osOpToOp(long osOperation){
 	int operation = 0;
 	if ((osOperation & OS.NSDragOperationCopy) != 0){
 		operation |= DND.DROP_COPY;
@@ -721,7 +721,7 @@ int osOpToOp(long /*int*/ osOperation){
 	return operation;
 }
 
-void pasteboard_provideDataForType(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+void pasteboard_provideDataForType(long id, long sel, long arg0, long arg1) {
 	NSPasteboard pasteboard = new NSPasteboard(arg0);
 	NSString dataType = new NSString(arg1);
 	if (pasteboard == null || dataType == null) return;
@@ -756,7 +756,7 @@ void pasteboard_provideDataForType(long /*int*/ id, long /*int*/ sel, long /*int
 		pasteboard.writeObjects(NSArray.arrayWithObject(url));
 	} else if (dataType.isEqual(OS.NSFilenamesPboardType) || dataType.isEqual(OS.kUTTypeFileURL)) {
 		NSArray array = (NSArray) transferData.data;
-		int count = (int) /*64*/ array.count();
+		int count = (int) array.count();
 		paths = new String[count];
 		exist = new boolean[count];
 		NSFileManager fileManager = NSFileManager.defaultManager();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java
index 65b389f56c..11c0fc8239 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java
@@ -81,7 +81,7 @@ import org.eclipse.swt.widgets.*;
 public class DropTarget extends Widget {
 
 	static Callback dropTarget2Args, dropTarget3Args, dropTarget6Args;
-	static long /*int*/ proc2Args, proc3Args, proc6Args;
+	static long proc2Args, proc3Args, proc6Args;
 	static final String LOCK_CURSOR = "org.eclipse.swt.internal.lockCursor"; //$NON-NLS-1$
 
 	static {
@@ -124,27 +124,27 @@ void addDragHandlers() {
 	// the types with the Control's NSView and AppKit will call the methods in the protocol
 	// when a drag goes over the view.
 
-	long /*int*/ cls = OS.object_getClass(control.view.id);
+	long cls = OS.object_getClass(control.view.id);
 
 	if (cls == 0) {
 		DND.error(DND.ERROR_CANNOT_INIT_DROP);
 	}
 
 	// If we already added it, no need to do it again.
-	long /*int*/ procPtr = OS.class_getMethodImplementation(cls, OS.sel_draggingEntered_);
+	long procPtr = OS.class_getMethodImplementation(cls, OS.sel_draggingEntered_);
 	if (procPtr == proc3Args) return;
 	addDragHandlers(cls);
 
 	// If the content view can be image view, then add the dragging methods to image view too.
 	// This is used by Label so that dragging can work even when the Label has an image set on it.
-	long /*int*/ imageView = 0;
+	long imageView = 0;
 	if ((imageView = OS.objc_msgSend(control.view.id, OS.sel_getImageView)) != 0) {
 		cls = OS.object_getClass(imageView);
 		addDragHandlers(cls);
 	}
 }
 
-void addDragHandlers (long /*int*/ cls) {
+void addDragHandlers (long cls) {
 	// Add the NSDraggingDestination callbacks
 	OS.class_addMethod(cls, OS.sel_draggingEntered_, proc3Args, "@:@");
 	OS.class_addMethod(cls, OS.sel_draggingUpdated_, proc3Args, "@:@");
@@ -206,7 +206,7 @@ public void addDropListener(DropTargetListener listener) {
 	addListener (DND.DropAccept, typedListener);
 }
 
-long /*int*/ dndCallSuper (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+long dndCallSuper (long id, long sel, long arg0) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -227,7 +227,7 @@ protected void checkSubclass () {
 	}
 }
 
-int draggingEntered(long /*int*/ id, long /*int*/ sel, NSObject sender) {
+int draggingEntered(long id, long sel, NSObject sender) {
 	if (sender == null) return OS.NSDragOperationNone;
 
 	DNDEvent event = new DNDEvent();
@@ -273,12 +273,12 @@ int draggingEntered(long /*int*/ id, long /*int*/ sel, NSObject sender) {
 	}
 
 	if (new NSObject(id).isKindOfClass(OS.class_NSTableView)) {
-		return (int)/*64*/dndCallSuper(id, sel, sender.id);
+		return (int)dndCallSuper(id, sel, sender.id);
 	}
 	return opToOsOp(selectedOperation);
 }
 
-void draggingExited(long /*int*/ id, long /*int*/ sel, NSObject sender) {
+void draggingExited(long id, long sel, NSObject sender) {
 	clearDropNotAllowed();
 	if (keyOperation == -1) return;
 	keyOperation = -1;
@@ -294,7 +294,7 @@ void draggingExited(long /*int*/ id, long /*int*/ sel, NSObject sender) {
 	}
 }
 
-int draggingUpdated(long /*int*/ id, long /*int*/ sel, NSObject sender) {
+int draggingUpdated(long id, long sel, NSObject sender) {
 	if (sender == null) return OS.NSDragOperationNone;
 	int oldKeyOperation = keyOperation;
 
@@ -349,7 +349,7 @@ int draggingUpdated(long /*int*/ id, long /*int*/ sel, NSObject sender) {
 	}
 
 	if (new NSObject(id).isKindOfClass(OS.class_NSTableView)) {
-		return (int)/*64*/dndCallSuper(id, sel, sender.id);
+		return (int)dndCallSuper(id, sel, sender.id);
 	}
 
 	return opToOsOp(selectedOperation);
@@ -417,7 +417,7 @@ public DropTarget(Control control, int style) {
 	addDragHandlers();
 }
 
-static long /*int*/ dropTargetProc(long /*int*/ id, long /*int*/ sel) {
+static long dropTargetProc(long id, long sel) {
 	Display display = Display.findDisplay(Thread.currentThread());
 	if (display == null || display.isDisposed()) return 0;
 	Widget widget = display.findWidget(id);
@@ -432,7 +432,7 @@ static long /*int*/ dropTargetProc(long /*int*/ id, long /*int*/ sel) {
 	return 0;
 }
 
-static long /*int*/ dropTargetProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+static long dropTargetProc(long id, long sel, long arg0) {
 	Display display = Display.findDisplay(Thread.currentThread());
 	if (display == null || display.isDisposed()) return 0;
 	Widget widget = display.findWidget(id);
@@ -457,7 +457,7 @@ static long /*int*/ dropTargetProc(long /*int*/ id, long /*int*/ sel, long /*int
 	return 0;
 }
 
-static long /*int*/ dropTargetProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
+static long dropTargetProc(long id, long sel, long arg0, long arg1, long arg2, long arg3) {
 	Display display = Display.findDisplay(Thread.currentThread());
 	if (display == null || display.isDisposed()) return 0;
 	Widget widget = display.findWidget(id);
@@ -549,7 +549,7 @@ int getOperationFromKeyState() {
 	// correct Cocoa behavior.  Control + Option or Command is NSDragOperationGeneric,
 	// or DND.DROP_DEFAULT in the SWT.
 	NSEvent currEvent = NSApplication.sharedApplication().currentEvent();
-	long /*int*/ modifiers = currEvent.modifierFlags();
+	long modifiers = currEvent.modifierFlags();
 	boolean option = (modifiers & OS.NSAlternateKeyMask) == OS.NSAlternateKeyMask;
 	boolean control = (modifiers & OS.NSControlKeyMask) == OS.NSControlKeyMask;
 	if (control && option) return DND.DROP_DEFAULT;
@@ -598,7 +598,7 @@ int opToOsOp(int operation) {
 	return osOperation;
 }
 
-int osOpToOp(long /*int*/ osOperation){
+int osOpToOp(long osOperation){
 	int operation = 0;
 	if ((osOperation & OS.NSDragOperationCopy) != 0){
 		operation |= DND.DROP_COPY;
@@ -732,7 +732,7 @@ boolean drop(NSObject sender) {
 	return (selectedOperation != DND.DROP_NONE);
 }
 
-boolean performDragOperation(long /*int*/ id, long /*int*/ sel, NSObject sender) {
+boolean performDragOperation(long id, long sel, NSObject sender) {
 	if (new NSObject(id).isKindOfClass(OS.class_NSTableView)) {
 		return dndCallSuper(id, sel, sender.id) != 0;
 	}
@@ -740,11 +740,11 @@ boolean performDragOperation(long /*int*/ id, long /*int*/ sel, NSObject sender)
 	return drop (sender);
 }
 
-boolean outlineView_acceptDrop_item_childIndex(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ info, long /*int*/ item, long /*int*/ index) {
+boolean outlineView_acceptDrop_item_childIndex(long id, long sel, long outlineView, long info, long item, long index) {
 	return drop(new NSObject(info));
 }
 
-long /*int*/ outlineView_validateDrop_proposedItem_proposedChildIndex(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ info, long /*int*/ item, long /*int*/ index) {
+long outlineView_validateDrop_proposedItem_proposedChildIndex(long id, long sel, long outlineView, long info, long item, long index) {
 	//TODO expansion animation and auto collapse not working because of outlineView:shouldExpandItem:
 	NSOutlineView widget = new NSOutlineView(outlineView);
 	NSObject sender = new NSObject(info);
@@ -825,7 +825,7 @@ boolean setEventData(NSObject draggingState, DNDEvent event) {
 
 	// get allowed operations
 	int style = getStyle();
-	long /*int*/ allowedActions = draggingState.draggingSourceOperationMask();
+	long allowedActions = draggingState.draggingSourceOperationMask();
 	int operations = osOpToOp(allowedActions) & style;
 	if (operations == DND.DROP_NONE) return false;
 
@@ -846,7 +846,7 @@ boolean setEventData(NSObject draggingState, DNDEvent event) {
 	NSArray draggedTypes = dragPBoard.types();
 	if (draggedTypes == null) return false;
 
-	long /*int*/ draggedTypeCount = draggedTypes.count();
+	long draggedTypeCount = draggedTypes.count();
 
 	TransferData[] dataTypes = new TransferData[(int)draggedTypeCount];
 	int index = -1;
@@ -961,16 +961,16 @@ void clearDropNotAllowed() {
 	}
 }
 
-boolean tableView_acceptDrop_row_dropOperation(long /*int*/ id, long /*int*/ sel, long /*int*/ tableView, long /*int*/ info, long /*int*/ row, long /*int*/ operation) {
+boolean tableView_acceptDrop_row_dropOperation(long id, long sel, long tableView, long info, long row, long operation) {
 	return drop(new NSObject(info));
 }
 
-int tableView_validateDrop_proposedRow_proposedDropOperation(long /*int*/ id, long /*int*/ sel, long /*int*/ tableView, long /*int*/ info, long /*int*/ row, long /*int*/ operation) {
+int tableView_validateDrop_proposedRow_proposedDropOperation(long id, long sel, long tableView, long info, long row, long operation) {
 	NSTableView widget = new NSTableView(tableView);
 	NSObject sender = new NSObject(info);
 	NSPoint pt = sender.draggingLocation();
 	pt = widget.convertPoint_fromView_(pt, null);
-	long /*int*/ hitRow = widget.rowAtPoint(pt);
+	long hitRow = widget.rowAtPoint(pt);
 	if (0 <= hitRow && hitRow < widget.numberOfRows()) {
 		if (feedback == 0) {
 			widget.setDropRow(-1, OS.NSTableViewDropOn);
@@ -991,7 +991,7 @@ int tableView_validateDrop_proposedRow_proposedDropOperation(long /*int*/ id, lo
 }
 
 // By returning true we get draggingUpdated messages even when the mouse isn't moving.
-boolean wantsPeriodicDraggingUpdates(long /*int*/ id, long /*int*/ sel) {
+boolean wantsPeriodicDraggingUpdates(long id, long sel) {
 	return true;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/FileTransfer.java
index db93afbfa9..4cc0095835 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/FileTransfer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/FileTransfer.java
@@ -98,7 +98,7 @@ public Object nativeToJava(TransferData transferData) {
 	if (!isSupportedType(transferData) || transferData.data == null) return null;
 	NSArray array = (NSArray) transferData.data;
 	if (array.count() == 0) return null;
-	int count = (int)/*64*/array.count();
+	int count = (int)array.count();
 	String[] fileNames = new String[count];
 	for (int i=0; i<count; i++) {
 		NSString string = new NSString(array.objectAtIndex(i));
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java
index fea6548f31..e762d514ef 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java
@@ -85,7 +85,7 @@ public class TableDragSourceEffect extends DragSourceEffect {
 		if (dragSourceImage != null) dragSourceImage.dispose();
 		dragSourceImage = null;
 		NSPoint point = new NSPoint();
-		long /*int*/ ptr = C.malloc(NSPoint.sizeof);
+		long ptr = C.malloc(NSPoint.sizeof);
 		OS.memmove(ptr, point, NSPoint.sizeof);
 		NSEvent nsEvent = NSApplication.sharedApplication().currentEvent();
 		NSTableView widget = (NSTableView)control.view;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TreeDragSourceEffect.java
index ca7cc6624e..e1d0311b43 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TreeDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TreeDragSourceEffect.java
@@ -84,7 +84,7 @@ public class TreeDragSourceEffect extends DragSourceEffect {
 		if (dragSourceImage != null) dragSourceImage.dispose();
 		dragSourceImage = null;
 		NSPoint point = new NSPoint();
-		long /*int*/ ptr = C.malloc(NSPoint.sizeof);
+		long ptr = C.malloc(NSPoint.sizeof);
 		OS.memmove(ptr, point, NSPoint.sizeof);
 		NSEvent nsEvent = NSApplication.sharedApplication().currentEvent();
 		NSTableView widget = (NSTableView)control.view;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java
index 1317bcfd06..0197cf7e37 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java
@@ -155,14 +155,14 @@ public GLCanvas (Composite parent, int style, GLData data) {
 public GLData getGLData () {
 	checkWidget ();
 	GLData data = new GLData ();
-	long /*int*/ [] value = new long /*int*/ [1];
+	long [] value = new long [1];
 	pixelFormat.getValues(value, OS.NSOpenGLPFADoubleBuffer, 0);
 	data.doubleBuffer = value [0] != 0;
 	pixelFormat.getValues(value, OS.NSOpenGLPFAStereo, 0);
 	data.stereo = value [0] != 0;
 
 	pixelFormat.getValues(value, OS.NSOpenGLPFAAlphaSize, 0);
-	data.alphaSize = (int/*64*/)value [0];
+	data.alphaSize = (int)value [0];
 
 	/*
 	 * Feature in Cocoa: NSOpenGL/CoreOpenGL only supports specifying the total number of bits
@@ -171,16 +171,16 @@ public GLData getGLData () {
 	 */
 	pixelFormat.getValues(value, OS.NSOpenGLPFAColorSize, 0);
 
-	int colorSize = ((int/*64*/)(value[0] - data.alphaSize)) / 3;
+	int colorSize = ((int)(value[0] - data.alphaSize)) / 3;
 
 	data.redSize = colorSize;
 	data.greenSize = colorSize;
 	data.blueSize = colorSize;
 
 	pixelFormat.getValues(value, OS.NSOpenGLPFADepthSize, 0);
-	data.depthSize = (int/*64*/)value [0];
+	data.depthSize = (int)value [0];
 	pixelFormat.getValues(value, OS.NSOpenGLPFAStencilSize, 0);
-	data.stencilSize = (int/*64*/)value [0];
+	data.stencilSize = (int)value [0];
 
 	/*
 	 * Feature(?) in Cocoa: NSOpenGL/CoreOpenGL doesn't support setting an accumulation buffer alpha, but
@@ -189,16 +189,16 @@ public GLData getGLData () {
 	 */
 	pixelFormat.getValues(value, OS.NSOpenGLPFAAccumSize, 0);
 
-	int accumColorSize = (int/*64*/)(value[0]) / 4;
+	int accumColorSize = (int)(value[0]) / 4;
 	data.accumRedSize = accumColorSize;
 	data.accumGreenSize = accumColorSize;
 	data.accumBlueSize = accumColorSize;
 	data.accumAlphaSize = accumColorSize;
 
 	pixelFormat.getValues(value, OS.NSOpenGLPFASampleBuffers, 0);
-	data.sampleBuffers = (int/*64*/)value [0];
+	data.sampleBuffers = (int)value [0];
 	pixelFormat.getValues(value, OS.NSOpenGLPFASamples, 0);
-	data.samples = (int/*64*/)value [0];
+	data.samples = (int)value [0];
 	return data;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
index c4e0c60bd6..d76726a58e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
@@ -25,14 +25,14 @@
 
 #ifndef NO_ATSFontActivateFromFileReference
 JNIEXPORT jint JNICALL OS_NATIVE(ATSFontActivateFromFileReference)
-	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2, jintLong arg3, jint arg4, jintLongArray arg5)
+	(JNIEnv *env, jclass that, jbyteArray arg0, jint arg1, jint arg2, jlong arg3, jint arg4, jlongArray arg5)
 {
 	jbyte *lparg0=NULL;
-	jintLong *lparg5=NULL;
+	jlong *lparg5=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, ATSFontActivateFromFileReference_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	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)ATSFontActivateFromFileReference((const FSRef *)lparg0, (ATSFontContext)arg1, (ATSFontFormat)arg2, (void *)arg3, (ATSOptionFlags)arg4, (ATSFontContainerRef *)lparg5);
 */
@@ -43,7 +43,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(ATSFontActivateFromFileReference)
 		}
 	}
 fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
+	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, ATSFontActivateFromFileReference_FUNC);
 	return rc;
@@ -51,18 +51,18 @@ fail:
 #endif
 
 #ifndef NO_AcquireRootMenu
-JNIEXPORT jintLong JNICALL OS_NATIVE(AcquireRootMenu)
+JNIEXPORT jlong JNICALL OS_NATIVE(AcquireRootMenu)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, AcquireRootMenu_FUNC);
 /*
-	rc = (jintLong)AcquireRootMenu();
+	rc = (jlong)AcquireRootMenu();
 */
 	{
 		OS_LOAD_FUNCTION(fp, AcquireRootMenu)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
+			rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, AcquireRootMenu_FUNC);
@@ -87,12 +87,12 @@ static jintLong CALLBACK_NSTextAttachmentCell_attachment(jintLong func) {
 	CALLBACK_1NSTextAttachmentCell_1attachment = func;
 	return (jintLong)proc_CALLBACK_1NSTextAttachmentCell_1attachment;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1NSTextAttachmentCell_1attachment)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1NSTextAttachmentCell_1attachment)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1NSTextAttachmentCell_1attachment_FUNC);
-	rc = (jintLong)CALLBACK_NSTextAttachmentCell_attachment(arg0);
+	rc = (jlong)CALLBACK_NSTextAttachmentCell_attachment(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1NSTextAttachmentCell_1attachment_FUNC);
 	return rc;
 }
@@ -115,12 +115,12 @@ static jintLong CALLBACK_NSTextAttachmentCell_cellSize(jintLong func) {
 	CALLBACK_1NSTextAttachmentCell_1cellSize = func;
 	return (jintLong)proc_CALLBACK_1NSTextAttachmentCell_1cellSize;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1NSTextAttachmentCell_1cellSize)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1NSTextAttachmentCell_1cellSize)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1NSTextAttachmentCell_1cellSize_FUNC);
-	rc = (jintLong)CALLBACK_NSTextAttachmentCell_cellSize(arg0);
+	rc = (jlong)CALLBACK_NSTextAttachmentCell_cellSize(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1NSTextAttachmentCell_1cellSize_FUNC);
 	return rc;
 }
@@ -135,12 +135,12 @@ static jintLong CALLBACK_accessibilityHitTest_(jintLong func) {
 	CALLBACK_1accessibilityHitTest_1 = func;
 	return (jintLong)proc_CALLBACK_1accessibilityHitTest_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1accessibilityHitTest_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1accessibilityHitTest_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1accessibilityHitTest_1_FUNC);
-	rc = (jintLong)CALLBACK_accessibilityHitTest_(arg0);
+	rc = (jlong)CALLBACK_accessibilityHitTest_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1accessibilityHitTest_1_FUNC);
 	return rc;
 }
@@ -155,12 +155,12 @@ static jintLong CALLBACK_attributedSubstringFromRange_(jintLong func) {
 	CALLBACK_1attributedSubstringFromRange_1 = func;
 	return (jintLong)proc_CALLBACK_1attributedSubstringFromRange_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1attributedSubstringFromRange_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1attributedSubstringFromRange_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1attributedSubstringFromRange_1_FUNC);
-	rc = (jintLong)CALLBACK_attributedSubstringFromRange_(arg0);
+	rc = (jlong)CALLBACK_attributedSubstringFromRange_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1attributedSubstringFromRange_1_FUNC);
 	return rc;
 }
@@ -175,12 +175,12 @@ static jintLong CALLBACK_cacheDisplayInRect_toBitmapImageRep_(jintLong func) {
 	CALLBACK_1cacheDisplayInRect_1toBitmapImageRep_1 = func;
 	return (jintLong)proc_CALLBACK_1cacheDisplayInRect_1toBitmapImageRep_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1cacheDisplayInRect_1toBitmapImageRep_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1cacheDisplayInRect_1toBitmapImageRep_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1cacheDisplayInRect_1toBitmapImageRep_1_FUNC);
-	rc = (jintLong)CALLBACK_cacheDisplayInRect_toBitmapImageRep_(arg0);
+	rc = (jlong)CALLBACK_cacheDisplayInRect_toBitmapImageRep_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1cacheDisplayInRect_1toBitmapImageRep_1_FUNC);
 	return rc;
 }
@@ -195,12 +195,12 @@ static jintLong CALLBACK_canDragRowsWithIndexes_atPoint_(jintLong func) {
 	CALLBACK_1canDragRowsWithIndexes_1atPoint_1 = func;
 	return (jintLong)proc_CALLBACK_1canDragRowsWithIndexes_1atPoint_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1canDragRowsWithIndexes_1atPoint_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1canDragRowsWithIndexes_1atPoint_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1canDragRowsWithIndexes_1atPoint_1_FUNC);
-	rc = (jintLong)CALLBACK_canDragRowsWithIndexes_atPoint_(arg0);
+	rc = (jlong)CALLBACK_canDragRowsWithIndexes_atPoint_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1canDragRowsWithIndexes_1atPoint_1_FUNC);
 	return rc;
 }
@@ -223,12 +223,12 @@ static jintLong CALLBACK_cellBaselineOffset(jintLong func) {
 	CALLBACK_1cellBaselineOffset = func;
 	return (jintLong)proc_CALLBACK_1cellBaselineOffset;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1cellBaselineOffset)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1cellBaselineOffset)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1cellBaselineOffset_FUNC);
-	rc = (jintLong)CALLBACK_cellBaselineOffset(arg0);
+	rc = (jlong)CALLBACK_cellBaselineOffset(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1cellBaselineOffset_FUNC);
 	return rc;
 }
@@ -251,12 +251,12 @@ static jintLong CALLBACK_cellSize(jintLong func) {
 	CALLBACK_1cellSize = func;
 	return (jintLong)proc_CALLBACK_1cellSize;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1cellSize)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1cellSize)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1cellSize_FUNC);
-	rc = (jintLong)CALLBACK_cellSize(arg0);
+	rc = (jlong)CALLBACK_cellSize(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1cellSize_FUNC);
 	return rc;
 }
@@ -279,12 +279,12 @@ static jintLong CALLBACK_cellSizeForBounds_(jintLong func) {
 	CALLBACK_1cellSizeForBounds_1 = func;
 	return (jintLong)proc_CALLBACK_1cellSizeForBounds_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1cellSizeForBounds_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1cellSizeForBounds_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1cellSizeForBounds_1_FUNC);
-	rc = (jintLong)CALLBACK_cellSizeForBounds_(arg0);
+	rc = (jlong)CALLBACK_cellSizeForBounds_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1cellSizeForBounds_1_FUNC);
 	return rc;
 }
@@ -299,12 +299,12 @@ static jintLong CALLBACK_characterIndexForPoint_(jintLong func) {
 	CALLBACK_1characterIndexForPoint_1 = func;
 	return (jintLong)proc_CALLBACK_1characterIndexForPoint_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1characterIndexForPoint_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1characterIndexForPoint_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1characterIndexForPoint_1_FUNC);
-	rc = (jintLong)CALLBACK_characterIndexForPoint_(arg0);
+	rc = (jlong)CALLBACK_characterIndexForPoint_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1characterIndexForPoint_1_FUNC);
 	return rc;
 }
@@ -319,12 +319,12 @@ static jintLong CALLBACK_columnAtPoint_(jintLong func) {
 	CALLBACK_1columnAtPoint_1 = func;
 	return (jintLong)proc_CALLBACK_1columnAtPoint_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1columnAtPoint_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1columnAtPoint_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1columnAtPoint_1_FUNC);
-	rc = (jintLong)CALLBACK_columnAtPoint_(arg0);
+	rc = (jlong)CALLBACK_columnAtPoint_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1columnAtPoint_1_FUNC);
 	return rc;
 }
@@ -339,12 +339,12 @@ static jintLong CALLBACK_dragSelectionWithEvent_offset_slideBack_(jintLong func)
 	CALLBACK_1dragSelectionWithEvent_1offset_1slideBack_1 = func;
 	return (jintLong)proc_CALLBACK_1dragSelectionWithEvent_1offset_1slideBack_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1dragSelectionWithEvent_1offset_1slideBack_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1dragSelectionWithEvent_1offset_1slideBack_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1dragSelectionWithEvent_1offset_1slideBack_1_FUNC);
-	rc = (jintLong)CALLBACK_dragSelectionWithEvent_offset_slideBack_(arg0);
+	rc = (jlong)CALLBACK_dragSelectionWithEvent_offset_slideBack_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1dragSelectionWithEvent_1offset_1slideBack_1_FUNC);
 	return rc;
 }
@@ -359,12 +359,12 @@ static jintLong CALLBACK_draggedImage_beganAt_(jintLong func) {
 	CALLBACK_1draggedImage_1beganAt_1 = func;
 	return (jintLong)proc_CALLBACK_1draggedImage_1beganAt_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1draggedImage_1beganAt_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1draggedImage_1beganAt_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1draggedImage_1beganAt_1_FUNC);
-	rc = (jintLong)CALLBACK_draggedImage_beganAt_(arg0);
+	rc = (jlong)CALLBACK_draggedImage_beganAt_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1draggedImage_1beganAt_1_FUNC);
 	return rc;
 }
@@ -379,12 +379,12 @@ static jintLong CALLBACK_draggedImage_endedAt_operation_(jintLong func) {
 	CALLBACK_1draggedImage_1endedAt_1operation_1 = func;
 	return (jintLong)proc_CALLBACK_1draggedImage_1endedAt_1operation_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1draggedImage_1endedAt_1operation_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1draggedImage_1endedAt_1operation_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1draggedImage_1endedAt_1operation_1_FUNC);
-	rc = (jintLong)CALLBACK_draggedImage_endedAt_operation_(arg0);
+	rc = (jlong)CALLBACK_draggedImage_endedAt_operation_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1draggedImage_1endedAt_1operation_1_FUNC);
 	return rc;
 }
@@ -399,12 +399,12 @@ static jintLong CALLBACK_drawBackgroundInClipRect_(jintLong func) {
 	CALLBACK_1drawBackgroundInClipRect_1 = func;
 	return (jintLong)proc_CALLBACK_1drawBackgroundInClipRect_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1drawBackgroundInClipRect_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1drawBackgroundInClipRect_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1drawBackgroundInClipRect_1_FUNC);
-	rc = (jintLong)CALLBACK_drawBackgroundInClipRect_(arg0);
+	rc = (jlong)CALLBACK_drawBackgroundInClipRect_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1drawBackgroundInClipRect_1_FUNC);
 	return rc;
 }
@@ -419,12 +419,12 @@ static jintLong CALLBACK_drawBezelWithFrame_inView_(jintLong func) {
 	CALLBACK_1drawBezelWithFrame_1inView_1 = func;
 	return (jintLong)proc_CALLBACK_1drawBezelWithFrame_1inView_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1drawBezelWithFrame_1inView_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1drawBezelWithFrame_1inView_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1drawBezelWithFrame_1inView_1_FUNC);
-	rc = (jintLong)CALLBACK_drawBezelWithFrame_inView_(arg0);
+	rc = (jlong)CALLBACK_drawBezelWithFrame_inView_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1drawBezelWithFrame_1inView_1_FUNC);
 	return rc;
 }
@@ -439,12 +439,12 @@ static jintLong CALLBACK_drawImage_withFrame_inView_(jintLong func) {
 	CALLBACK_1drawImage_1withFrame_1inView_1 = func;
 	return (jintLong)proc_CALLBACK_1drawImage_1withFrame_1inView_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1drawImage_1withFrame_1inView_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1drawImage_1withFrame_1inView_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1drawImage_1withFrame_1inView_1_FUNC);
-	rc = (jintLong)CALLBACK_drawImage_withFrame_inView_(arg0);
+	rc = (jlong)CALLBACK_drawImage_withFrame_inView_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1drawImage_1withFrame_1inView_1_FUNC);
 	return rc;
 }
@@ -459,12 +459,12 @@ static jintLong CALLBACK_drawInteriorWithFrame_inView_(jintLong func) {
 	CALLBACK_1drawInteriorWithFrame_1inView_1 = func;
 	return (jintLong)proc_CALLBACK_1drawInteriorWithFrame_1inView_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1drawInteriorWithFrame_1inView_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1drawInteriorWithFrame_1inView_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1drawInteriorWithFrame_1inView_1_FUNC);
-	rc = (jintLong)CALLBACK_drawInteriorWithFrame_inView_(arg0);
+	rc = (jlong)CALLBACK_drawInteriorWithFrame_inView_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1drawInteriorWithFrame_1inView_1_FUNC);
 	return rc;
 }
@@ -479,12 +479,12 @@ static jintLong CALLBACK_drawLabel_inRect_(jintLong func) {
 	CALLBACK_1drawLabel_1inRect_1 = func;
 	return (jintLong)proc_CALLBACK_1drawLabel_1inRect_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1drawLabel_1inRect_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1drawLabel_1inRect_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1drawLabel_1inRect_1_FUNC);
-	rc = (jintLong)CALLBACK_drawLabel_inRect_(arg0);
+	rc = (jlong)CALLBACK_drawLabel_inRect_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1drawLabel_1inRect_1_FUNC);
 	return rc;
 }
@@ -499,12 +499,12 @@ static jintLong CALLBACK_drawRect_(jintLong func) {
 	CALLBACK_1drawRect_1 = func;
 	return (jintLong)proc_CALLBACK_1drawRect_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1drawRect_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1drawRect_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1drawRect_1_FUNC);
-	rc = (jintLong)CALLBACK_drawRect_(arg0);
+	rc = (jlong)CALLBACK_drawRect_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1drawRect_1_FUNC);
 	return rc;
 }
@@ -527,12 +527,12 @@ static jintLong CALLBACK_drawTitle_withFrame_inView_(jintLong func) {
 	CALLBACK_1drawTitle_1withFrame_1inView_1 = func;
 	return (jintLong)proc_CALLBACK_1drawTitle_1withFrame_1inView_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1drawTitle_1withFrame_1inView_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1drawTitle_1withFrame_1inView_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1drawTitle_1withFrame_1inView_1_FUNC);
-	rc = (jintLong)CALLBACK_drawTitle_withFrame_inView_(arg0);
+	rc = (jlong)CALLBACK_drawTitle_withFrame_inView_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1drawTitle_1withFrame_1inView_1_FUNC);
 	return rc;
 }
@@ -547,12 +547,12 @@ static jintLong CALLBACK_drawViewBackgroundInRect_(jintLong func) {
 	CALLBACK_1drawViewBackgroundInRect_1 = func;
 	return (jintLong)proc_CALLBACK_1drawViewBackgroundInRect_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1drawViewBackgroundInRect_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1drawViewBackgroundInRect_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1drawViewBackgroundInRect_1_FUNC);
-	rc = (jintLong)CALLBACK_drawViewBackgroundInRect_(arg0);
+	rc = (jlong)CALLBACK_drawViewBackgroundInRect_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1drawViewBackgroundInRect_1_FUNC);
 	return rc;
 }
@@ -567,12 +567,12 @@ static jintLong CALLBACK_drawWithExpansionFrame_inView_(jintLong func) {
 	CALLBACK_1drawWithExpansionFrame_1inView_1 = func;
 	return (jintLong)proc_CALLBACK_1drawWithExpansionFrame_1inView_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1drawWithExpansionFrame_1inView_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1drawWithExpansionFrame_1inView_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1drawWithExpansionFrame_1inView_1_FUNC);
-	rc = (jintLong)CALLBACK_drawWithExpansionFrame_inView_(arg0);
+	rc = (jlong)CALLBACK_drawWithExpansionFrame_inView_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1drawWithExpansionFrame_1inView_1_FUNC);
 	return rc;
 }
@@ -595,12 +595,12 @@ static jintLong CALLBACK_expansionFrameWithFrame_inView_(jintLong func) {
 	CALLBACK_1expansionFrameWithFrame_1inView_1 = func;
 	return (jintLong)proc_CALLBACK_1expansionFrameWithFrame_1inView_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1expansionFrameWithFrame_1inView_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1expansionFrameWithFrame_1inView_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1expansionFrameWithFrame_1inView_1_FUNC);
-	rc = (jintLong)CALLBACK_expansionFrameWithFrame_inView_(arg0);
+	rc = (jlong)CALLBACK_expansionFrameWithFrame_inView_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1expansionFrameWithFrame_1inView_1_FUNC);
 	return rc;
 }
@@ -623,12 +623,12 @@ static jintLong CALLBACK_firstRectForCharacterRange_(jintLong func) {
 	CALLBACK_1firstRectForCharacterRange_1 = func;
 	return (jintLong)proc_CALLBACK_1firstRectForCharacterRange_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1firstRectForCharacterRange_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1firstRectForCharacterRange_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1firstRectForCharacterRange_1_FUNC);
-	rc = (jintLong)CALLBACK_firstRectForCharacterRange_(arg0);
+	rc = (jlong)CALLBACK_firstRectForCharacterRange_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1firstRectForCharacterRange_1_FUNC);
 	return rc;
 }
@@ -651,12 +651,12 @@ static jintLong CALLBACK_focusRingMaskBoundsForFrame_inView_(jintLong func) {
 	CALLBACK_1focusRingMaskBoundsForFrame_1inView_1 = func;
 	return (jintLong)proc_CALLBACK_1focusRingMaskBoundsForFrame_1inView_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1focusRingMaskBoundsForFrame_1inView_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1focusRingMaskBoundsForFrame_1inView_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1focusRingMaskBoundsForFrame_1inView_1_FUNC);
-	rc = (jintLong)CALLBACK_focusRingMaskBoundsForFrame_inView_(arg0);
+	rc = (jlong)CALLBACK_focusRingMaskBoundsForFrame_inView_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1focusRingMaskBoundsForFrame_1inView_1_FUNC);
 	return rc;
 }
@@ -679,12 +679,12 @@ static jintLong CALLBACK_headerRectOfColumn_(jintLong func) {
 	CALLBACK_1headerRectOfColumn_1 = func;
 	return (jintLong)proc_CALLBACK_1headerRectOfColumn_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1headerRectOfColumn_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1headerRectOfColumn_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1headerRectOfColumn_1_FUNC);
-	rc = (jintLong)CALLBACK_headerRectOfColumn_(arg0);
+	rc = (jlong)CALLBACK_headerRectOfColumn_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1headerRectOfColumn_1_FUNC);
 	return rc;
 }
@@ -699,12 +699,12 @@ static jintLong CALLBACK_highlightSelectionInClipRect_(jintLong func) {
 	CALLBACK_1highlightSelectionInClipRect_1 = func;
 	return (jintLong)proc_CALLBACK_1highlightSelectionInClipRect_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1highlightSelectionInClipRect_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1highlightSelectionInClipRect_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1highlightSelectionInClipRect_1_FUNC);
-	rc = (jintLong)CALLBACK_highlightSelectionInClipRect_(arg0);
+	rc = (jlong)CALLBACK_highlightSelectionInClipRect_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1highlightSelectionInClipRect_1_FUNC);
 	return rc;
 }
@@ -719,12 +719,12 @@ static jintLong CALLBACK_hitTestForEvent_inRect_ofView_(jintLong func) {
 	CALLBACK_1hitTestForEvent_1inRect_1ofView_1 = func;
 	return (jintLong)proc_CALLBACK_1hitTestForEvent_1inRect_1ofView_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1hitTestForEvent_1inRect_1ofView_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1hitTestForEvent_1inRect_1ofView_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1hitTestForEvent_1inRect_1ofView_1_FUNC);
-	rc = (jintLong)CALLBACK_hitTestForEvent_inRect_ofView_(arg0);
+	rc = (jlong)CALLBACK_hitTestForEvent_inRect_ofView_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1hitTestForEvent_1inRect_1ofView_1_FUNC);
 	return rc;
 }
@@ -739,12 +739,12 @@ static jintLong CALLBACK_hitTest_(jintLong func) {
 	CALLBACK_1hitTest_1 = func;
 	return (jintLong)proc_CALLBACK_1hitTest_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1hitTest_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1hitTest_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1hitTest_1_FUNC);
-	rc = (jintLong)CALLBACK_hitTest_(arg0);
+	rc = (jlong)CALLBACK_hitTest_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1hitTest_1_FUNC);
 	return rc;
 }
@@ -767,12 +767,12 @@ static jintLong CALLBACK_imageRectForBounds_(jintLong func) {
 	CALLBACK_1imageRectForBounds_1 = func;
 	return (jintLong)proc_CALLBACK_1imageRectForBounds_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1imageRectForBounds_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1imageRectForBounds_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1imageRectForBounds_1_FUNC);
-	rc = (jintLong)CALLBACK_imageRectForBounds_(arg0);
+	rc = (jlong)CALLBACK_imageRectForBounds_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1imageRectForBounds_1_FUNC);
 	return rc;
 }
@@ -795,12 +795,12 @@ static jintLong CALLBACK_markedRange(jintLong func) {
 	CALLBACK_1markedRange = func;
 	return (jintLong)proc_CALLBACK_1markedRange;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1markedRange)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1markedRange)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1markedRange_FUNC);
-	rc = (jintLong)CALLBACK_markedRange(arg0);
+	rc = (jlong)CALLBACK_markedRange(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1markedRange_FUNC);
 	return rc;
 }
@@ -815,12 +815,12 @@ static jintLong CALLBACK_scrollClipView_toPoint_(jintLong func) {
 	CALLBACK_1scrollClipView_1toPoint_1 = func;
 	return (jintLong)proc_CALLBACK_1scrollClipView_1toPoint_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1scrollClipView_1toPoint_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1scrollClipView_1toPoint_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1scrollClipView_1toPoint_1_FUNC);
-	rc = (jintLong)CALLBACK_scrollClipView_toPoint_(arg0);
+	rc = (jlong)CALLBACK_scrollClipView_toPoint_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1scrollClipView_1toPoint_1_FUNC);
 	return rc;
 }
@@ -843,12 +843,12 @@ static jintLong CALLBACK_selectedRange(jintLong func) {
 	CALLBACK_1selectedRange = func;
 	return (jintLong)proc_CALLBACK_1selectedRange;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1selectedRange)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1selectedRange)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1selectedRange_FUNC);
-	rc = (jintLong)CALLBACK_selectedRange(arg0);
+	rc = (jlong)CALLBACK_selectedRange(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1selectedRange_FUNC);
 	return rc;
 }
@@ -863,12 +863,12 @@ static jintLong CALLBACK_setFrameOrigin_(jintLong func) {
 	CALLBACK_1setFrameOrigin_1 = func;
 	return (jintLong)proc_CALLBACK_1setFrameOrigin_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1setFrameOrigin_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1setFrameOrigin_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1setFrameOrigin_1_FUNC);
-	rc = (jintLong)CALLBACK_setFrameOrigin_(arg0);
+	rc = (jlong)CALLBACK_setFrameOrigin_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1setFrameOrigin_1_FUNC);
 	return rc;
 }
@@ -883,12 +883,12 @@ static jintLong CALLBACK_setFrameSize_(jintLong func) {
 	CALLBACK_1setFrameSize_1 = func;
 	return (jintLong)proc_CALLBACK_1setFrameSize_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1setFrameSize_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1setFrameSize_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1setFrameSize_1_FUNC);
-	rc = (jintLong)CALLBACK_setFrameSize_(arg0);
+	rc = (jlong)CALLBACK_setFrameSize_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1setFrameSize_1_FUNC);
 	return rc;
 }
@@ -903,12 +903,12 @@ static jintLong CALLBACK_setFrame_(jintLong func) {
 	CALLBACK_1setFrame_1 = func;
 	return (jintLong)proc_CALLBACK_1setFrame_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1setFrame_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1setFrame_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1setFrame_1_FUNC);
-	rc = (jintLong)CALLBACK_setFrame_(arg0);
+	rc = (jlong)CALLBACK_setFrame_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1setFrame_1_FUNC);
 	return rc;
 }
@@ -923,12 +923,12 @@ static jintLong CALLBACK_setMarkedText_selectedRange_(jintLong func) {
 	CALLBACK_1setMarkedText_1selectedRange_1 = func;
 	return (jintLong)proc_CALLBACK_1setMarkedText_1selectedRange_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1setMarkedText_1selectedRange_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1setMarkedText_1selectedRange_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1setMarkedText_1selectedRange_1_FUNC);
-	rc = (jintLong)CALLBACK_setMarkedText_selectedRange_(arg0);
+	rc = (jlong)CALLBACK_setMarkedText_selectedRange_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1setMarkedText_1selectedRange_1_FUNC);
 	return rc;
 }
@@ -943,12 +943,12 @@ static jintLong CALLBACK_setNeedsDisplayInRect_(jintLong func) {
 	CALLBACK_1setNeedsDisplayInRect_1 = func;
 	return (jintLong)proc_CALLBACK_1setNeedsDisplayInRect_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1setNeedsDisplayInRect_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1setNeedsDisplayInRect_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1setNeedsDisplayInRect_1_FUNC);
-	rc = (jintLong)CALLBACK_setNeedsDisplayInRect_(arg0);
+	rc = (jlong)CALLBACK_setNeedsDisplayInRect_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1setNeedsDisplayInRect_1_FUNC);
 	return rc;
 }
@@ -963,12 +963,12 @@ static jintLong CALLBACK_shouldChangeTextInRange_replacementString_(jintLong fun
 	CALLBACK_1shouldChangeTextInRange_1replacementString_1 = func;
 	return (jintLong)proc_CALLBACK_1shouldChangeTextInRange_1replacementString_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1shouldChangeTextInRange_1replacementString_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1shouldChangeTextInRange_1replacementString_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1shouldChangeTextInRange_1replacementString_1_FUNC);
-	rc = (jintLong)CALLBACK_shouldChangeTextInRange_replacementString_(arg0);
+	rc = (jlong)CALLBACK_shouldChangeTextInRange_replacementString_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1shouldChangeTextInRange_1replacementString_1_FUNC);
 	return rc;
 }
@@ -991,12 +991,12 @@ static jintLong CALLBACK_sizeOfLabel_(jintLong func) {
 	CALLBACK_1sizeOfLabel_1 = func;
 	return (jintLong)proc_CALLBACK_1sizeOfLabel_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1sizeOfLabel_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1sizeOfLabel_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1sizeOfLabel_1_FUNC);
-	rc = (jintLong)CALLBACK_sizeOfLabel_(arg0);
+	rc = (jlong)CALLBACK_sizeOfLabel_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1sizeOfLabel_1_FUNC);
 	return rc;
 }
@@ -1019,12 +1019,12 @@ static jintLong CALLBACK_textView_willChangeSelectionFromCharacterRange_toCharac
 	CALLBACK_1textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1 = func;
 	return (jintLong)proc_CALLBACK_1textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1_FUNC);
-	rc = (jintLong)CALLBACK_textView_willChangeSelectionFromCharacterRange_toCharacterRange_(arg0);
+	rc = (jlong)CALLBACK_textView_willChangeSelectionFromCharacterRange_toCharacterRange_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1textView_1willChangeSelectionFromCharacterRange_1toCharacterRange_1_FUNC);
 	return rc;
 }
@@ -1047,12 +1047,12 @@ static jintLong CALLBACK_titleRectForBounds_(jintLong func) {
 	CALLBACK_1titleRectForBounds_1 = func;
 	return (jintLong)proc_CALLBACK_1titleRectForBounds_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1titleRectForBounds_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1titleRectForBounds_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1titleRectForBounds_1_FUNC);
-	rc = (jintLong)CALLBACK_titleRectForBounds_(arg0);
+	rc = (jlong)CALLBACK_titleRectForBounds_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1titleRectForBounds_1_FUNC);
 	return rc;
 }
@@ -1067,12 +1067,12 @@ static jintLong CALLBACK_view_stringForToolTip_point_userData_(jintLong func) {
 	CALLBACK_1view_1stringForToolTip_1point_1userData_1 = func;
 	return (jintLong)proc_CALLBACK_1view_1stringForToolTip_1point_1userData_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1view_1stringForToolTip_1point_1userData_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1view_1stringForToolTip_1point_1userData_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1view_1stringForToolTip_1point_1userData_1_FUNC);
-	rc = (jintLong)CALLBACK_view_stringForToolTip_point_userData_(arg0);
+	rc = (jlong)CALLBACK_view_stringForToolTip_point_userData_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1view_1stringForToolTip_1point_1userData_1_FUNC);
 	return rc;
 }
@@ -1087,48 +1087,48 @@ static jintLong CALLBACK_webView_setFrame_(jintLong func) {
 	CALLBACK_1webView_1setFrame_1 = func;
 	return (jintLong)proc_CALLBACK_1webView_1setFrame_1;
 }
-JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1webView_1setFrame_1)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CALLBACK_1webView_1setFrame_1)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CALLBACK_1webView_1setFrame_1_FUNC);
-	rc = (jintLong)CALLBACK_webView_setFrame_(arg0);
+	rc = (jlong)CALLBACK_webView_setFrame_(arg0);
 	OS_NATIVE_EXIT(env, that, CALLBACK_1webView_1setFrame_1_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CFAttributedStringCreate
-JNIEXPORT jintLong JNICALL OS_NATIVE(CFAttributedStringCreate)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(CFAttributedStringCreate)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CFAttributedStringCreate_FUNC);
-	rc = (jintLong)CFAttributedStringCreate((CFAllocatorRef)arg0, (CFStringRef)arg1, (CFDictionaryRef)arg2);
+	rc = (jlong)CFAttributedStringCreate((CFAllocatorRef)arg0, (CFStringRef)arg1, (CFDictionaryRef)arg2);
 	OS_NATIVE_EXIT(env, that, CFAttributedStringCreate_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CFDataGetBytePtr
-JNIEXPORT jintLong JNICALL OS_NATIVE(CFDataGetBytePtr)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CFDataGetBytePtr)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CFDataGetBytePtr_FUNC);
-	rc = (jintLong)CFDataGetBytePtr((CFDataRef)arg0);
+	rc = (jlong)CFDataGetBytePtr((CFDataRef)arg0);
 	OS_NATIVE_EXIT(env, that, CFDataGetBytePtr_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CFDataGetLength
-JNIEXPORT jintLong JNICALL OS_NATIVE(CFDataGetLength)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CFDataGetLength)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CFDataGetLength_FUNC);
-	rc = (jintLong)CFDataGetLength((CFDataRef)arg0);
+	rc = (jlong)CFDataGetLength((CFDataRef)arg0);
 	OS_NATIVE_EXIT(env, that, CFDataGetLength_FUNC);
 	return rc;
 }
@@ -1136,7 +1136,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CFDataGetLength)
 
 #ifndef NO_CFDictionaryAddValue
 JNIEXPORT void JNICALL OS_NATIVE(CFDictionaryAddValue)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
 {
 	OS_NATIVE_ENTER(env, that, CFDictionaryAddValue_FUNC);
 	CFDictionaryAddValue((CFMutableDictionaryRef)arg0, (void*)arg1, (void*)arg2);
@@ -1145,12 +1145,12 @@ JNIEXPORT void JNICALL OS_NATIVE(CFDictionaryAddValue)
 #endif
 
 #ifndef NO_CFDictionaryCreateMutable
-JNIEXPORT jintLong JNICALL OS_NATIVE(CFDictionaryCreateMutable)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+JNIEXPORT jlong JNICALL OS_NATIVE(CFDictionaryCreateMutable)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CFDictionaryCreateMutable_FUNC);
-	rc = (jintLong)CFDictionaryCreateMutable((CFAllocatorRef)arg0, (CFIndex)arg1, (CFDictionaryKeyCallBacks*)arg2, (CFDictionaryValueCallBacks*)arg3);
+	rc = (jlong)CFDictionaryCreateMutable((CFAllocatorRef)arg0, (CFIndex)arg1, (CFDictionaryKeyCallBacks*)arg2, (CFDictionaryValueCallBacks*)arg3);
 	OS_NATIVE_EXIT(env, that, CFDictionaryCreateMutable_FUNC);
 	return rc;
 }
@@ -1170,7 +1170,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CFRange_1sizeof)
 
 #ifndef NO_CFRelease
 JNIEXPORT void JNICALL OS_NATIVE(CFRelease)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CFRelease_FUNC);
 	CFRelease((CFTypeRef)arg0);
@@ -1180,7 +1180,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CFRelease)
 
 #ifndef NO_CFRunLoopAddObserver
 JNIEXPORT void JNICALL OS_NATIVE(CFRunLoopAddObserver)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
 {
 	OS_NATIVE_ENTER(env, that, CFRunLoopAddObserver_FUNC);
 	CFRunLoopAddObserver((CFRunLoopRef)arg0, (CFRunLoopObserverRef)arg1, (CFStringRef)arg2);
@@ -1189,24 +1189,24 @@ JNIEXPORT void JNICALL OS_NATIVE(CFRunLoopAddObserver)
 #endif
 
 #ifndef NO_CFRunLoopGetCurrent
-JNIEXPORT jintLong JNICALL OS_NATIVE(CFRunLoopGetCurrent)
+JNIEXPORT jlong JNICALL OS_NATIVE(CFRunLoopGetCurrent)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CFRunLoopGetCurrent_FUNC);
-	rc = (jintLong)CFRunLoopGetCurrent();
+	rc = (jlong)CFRunLoopGetCurrent();
 	OS_NATIVE_EXIT(env, that, CFRunLoopGetCurrent_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CFRunLoopObserverCreate
-JNIEXPORT jintLong JNICALL OS_NATIVE(CFRunLoopObserverCreate)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jintLong arg3, jintLong arg4, jintLong arg5)
+JNIEXPORT jlong JNICALL OS_NATIVE(CFRunLoopObserverCreate)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2, jlong arg3, jlong arg4, jlong arg5)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CFRunLoopObserverCreate_FUNC);
-	rc = (jintLong)CFRunLoopObserverCreate((CFAllocatorRef)arg0, (CFOptionFlags)arg1, (Boolean)arg2, (CFIndex)arg3, (CFRunLoopObserverCallBack)arg4, (CFRunLoopObserverContext*)arg5);
+	rc = (jlong)CFRunLoopObserverCreate((CFAllocatorRef)arg0, (CFOptionFlags)arg1, (Boolean)arg2, (CFIndex)arg3, (CFRunLoopObserverCallBack)arg4, (CFRunLoopObserverContext*)arg5);
 	OS_NATIVE_EXIT(env, that, CFRunLoopObserverCreate_FUNC);
 	return rc;
 }
@@ -1214,7 +1214,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CFRunLoopObserverCreate)
 
 #ifndef NO_CFRunLoopObserverInvalidate
 JNIEXPORT void JNICALL OS_NATIVE(CFRunLoopObserverInvalidate)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CFRunLoopObserverInvalidate_FUNC);
 	CFRunLoopObserverInvalidate((CFRunLoopObserverRef)arg0);
@@ -1224,7 +1224,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CFRunLoopObserverInvalidate)
 
 #ifndef NO_CFRunLoopRunInMode
 JNIEXPORT jint JNICALL OS_NATIVE(CFRunLoopRunInMode)
-	(JNIEnv *env, jclass that, jintLong arg0, jdouble arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jboolean arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CFRunLoopRunInMode_FUNC);
@@ -1236,7 +1236,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CFRunLoopRunInMode)
 
 #ifndef NO_CFRunLoopStop
 JNIEXPORT void JNICALL OS_NATIVE(CFRunLoopStop)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CFRunLoopStop_FUNC);
 	CFRunLoopStop((CFRunLoopRef)arg0);
@@ -1245,14 +1245,14 @@ JNIEXPORT void JNICALL OS_NATIVE(CFRunLoopStop)
 #endif
 
 #ifndef NO_CFStringCreateWithCharacters
-JNIEXPORT jintLong JNICALL OS_NATIVE(CFStringCreateWithCharacters)
-	(JNIEnv *env, jclass that, jintLong arg0, jcharArray arg1, jintLong arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(CFStringCreateWithCharacters)
+	(JNIEnv *env, jclass that, jlong arg0, jcharArray arg1, jlong arg2)
 {
 	jchar *lparg1=NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CFStringCreateWithCharacters_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetCharArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)CFStringCreateWithCharacters((CFAllocatorRef)arg0, (UniChar*)lparg1, (CFIndex)arg2);
+	rc = (jlong)CFStringCreateWithCharacters((CFAllocatorRef)arg0, (UniChar*)lparg1, (CFIndex)arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseCharArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, CFStringCreateWithCharacters_FUNC);
@@ -1261,14 +1261,14 @@ fail:
 #endif
 
 #ifndef NO_CFURLCreateFromFSRef
-JNIEXPORT jintLong JNICALL OS_NATIVE(CFURLCreateFromFSRef)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(CFURLCreateFromFSRef)
+	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
 {
 	jbyte *lparg1=NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CFURLCreateFromFSRef_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)CFURLCreateFromFSRef((CFAllocatorRef)arg0, (FSRef*)lparg1);
+	rc = (jlong)CFURLCreateFromFSRef((CFAllocatorRef)arg0, (FSRef*)lparg1);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, CFURLCreateFromFSRef_FUNC);
@@ -1277,12 +1277,12 @@ fail:
 #endif
 
 #ifndef NO_CFURLCreateStringByAddingPercentEscapes
-JNIEXPORT jintLong JNICALL OS_NATIVE(CFURLCreateStringByAddingPercentEscapes)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jint arg4)
+JNIEXPORT jlong JNICALL OS_NATIVE(CFURLCreateStringByAddingPercentEscapes)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CFURLCreateStringByAddingPercentEscapes_FUNC);
-	rc = (jintLong)CFURLCreateStringByAddingPercentEscapes((CFAllocatorRef)arg0, (CFStringRef)arg1, (CFStringRef)arg2, (CFStringRef)arg3, (CFStringEncoding)arg4);
+	rc = (jlong)CFURLCreateStringByAddingPercentEscapes((CFAllocatorRef)arg0, (CFStringRef)arg1, (CFStringRef)arg2, (CFStringRef)arg3, (CFStringEncoding)arg4);
 	OS_NATIVE_EXIT(env, that, CFURLCreateStringByAddingPercentEscapes_FUNC);
 	return rc;
 }
@@ -1301,52 +1301,52 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGAffineTransform_1sizeof)
 #endif
 
 #ifndef NO_CGBitmapContextCreate
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGBitmapContextCreate)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jint arg6)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGBitmapContextCreate)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGBitmapContextCreate_FUNC);
-	rc = (jintLong)CGBitmapContextCreate((void*)arg0, (size_t)arg1, (size_t)arg2, (size_t)arg3, (size_t)arg4, (CGColorSpaceRef)arg5, (CGBitmapInfo)arg6);
+	rc = (jlong)CGBitmapContextCreate((void*)arg0, (size_t)arg1, (size_t)arg2, (size_t)arg3, (size_t)arg4, (CGColorSpaceRef)arg5, (CGBitmapInfo)arg6);
 	OS_NATIVE_EXIT(env, that, CGBitmapContextCreate_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CGBitmapContextCreateImage
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGBitmapContextCreateImage)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGBitmapContextCreateImage)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGBitmapContextCreateImage_FUNC);
-	rc = (jintLong)CGBitmapContextCreateImage((CGContextRef)arg0);
+	rc = (jlong)CGBitmapContextCreateImage((CGContextRef)arg0);
 	OS_NATIVE_EXIT(env, that, CGBitmapContextCreateImage_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CGBitmapContextGetData
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGBitmapContextGetData)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGBitmapContextGetData)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGBitmapContextGetData_FUNC);
-	rc = (jintLong)CGBitmapContextGetData((CGContextRef)arg0);
+	rc = (jlong)CGBitmapContextGetData((CGContextRef)arg0);
 	OS_NATIVE_EXIT(env, that, CGBitmapContextGetData_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CGColorCreate
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGColorCreate)
-	(JNIEnv *env, jclass that, jintLong arg0, jfloatDoubleArray arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGColorCreate)
+	(JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1)
 {
-	jfloatDouble *lparg1=NULL;
-	jintLong rc = 0;
+	jdouble *lparg1=NULL;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGColorCreate_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetFloatDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)CGColorCreate((CGColorSpaceRef)arg0, (CGFloat*)lparg1);
+	if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	rc = (jlong)CGColorCreate((CGColorSpaceRef)arg0, (CGFloat*)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseFloatDoubleArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, CGColorCreate_FUNC);
 	return rc;
 }
@@ -1354,7 +1354,7 @@ fail:
 
 #ifndef NO_CGColorRelease
 JNIEXPORT void JNICALL OS_NATIVE(CGColorRelease)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CGColorRelease_FUNC);
 	CGColorRelease((CGColorRef)arg0);
@@ -1363,12 +1363,12 @@ JNIEXPORT void JNICALL OS_NATIVE(CGColorRelease)
 #endif
 
 #ifndef NO_CGColorSpaceCreateDeviceRGB
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGColorSpaceCreateDeviceRGB)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGColorSpaceCreateDeviceRGB)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGColorSpaceCreateDeviceRGB_FUNC);
-	rc = (jintLong)CGColorSpaceCreateDeviceRGB();
+	rc = (jlong)CGColorSpaceCreateDeviceRGB();
 	OS_NATIVE_EXIT(env, that, CGColorSpaceCreateDeviceRGB_FUNC);
 	return rc;
 }
@@ -1376,7 +1376,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGColorSpaceCreateDeviceRGB)
 
 #ifndef NO_CGColorSpaceRelease
 JNIEXPORT void JNICALL OS_NATIVE(CGColorSpaceRelease)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CGColorSpaceRelease_FUNC);
 	CGColorSpaceRelease((CGColorSpaceRef)arg0);
@@ -1386,7 +1386,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGColorSpaceRelease)
 
 #ifndef NO_CGContextAddPath
 JNIEXPORT void JNICALL OS_NATIVE(CGContextAddPath)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
 	OS_NATIVE_ENTER(env, that, CGContextAddPath_FUNC);
 	CGContextAddPath((CGContextRef)arg0, (CGPathRef)arg1);
@@ -1396,7 +1396,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextAddPath)
 
 #ifndef NO_CGContextBeginTransparencyLayerWithRect
 JNIEXPORT void JNICALL OS_NATIVE(CGContextBeginTransparencyLayerWithRect)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
 {
 	CGRect _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, CGContextBeginTransparencyLayerWithRect_FUNC);
@@ -1409,18 +1409,18 @@ fail:
 #endif
 
 #ifndef NO_CGContextCopyPath
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGContextCopyPath)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGContextCopyPath)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGContextCopyPath_FUNC);
 /*
-	rc = (jintLong)CGContextCopyPath((CGContextRef)arg0);
+	rc = (jlong)CGContextCopyPath((CGContextRef)arg0);
 */
 	{
 		OS_LOAD_FUNCTION(fp, CGContextCopyPath)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGContextRef))fp)((CGContextRef)arg0);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(CGContextRef))fp)((CGContextRef)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CGContextCopyPath_FUNC);
@@ -1430,7 +1430,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGContextCopyPath)
 
 #ifndef NO_CGContextCopyWindowContentsToRect
 JNIEXPORT void JNICALL OS_NATIVE(CGContextCopyWindowContentsToRect)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jintLong arg3, jobject arg4)
+	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2, jlong arg3, jobject arg4)
 {
 	CGRect _arg1, *lparg1=NULL;
 	CGRect _arg4, *lparg4=NULL;
@@ -1443,7 +1443,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextCopyWindowContentsToRect)
 	{
 		OS_LOAD_FUNCTION(fp, CGContextCopyWindowContentsToRect)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, CGRect, jintLong, jintLong, CGRect))fp)(arg0, *lparg1, arg2, arg3, *lparg4);
+			((void (CALLING_CONVENTION*)(jlong, CGRect, jlong, jlong, CGRect))fp)(arg0, *lparg1, arg2, arg3, *lparg4);
 		}
 	}
 fail:
@@ -1455,7 +1455,7 @@ fail:
 
 #ifndef NO_CGContextDrawImage
 JNIEXPORT void JNICALL OS_NATIVE(CGContextDrawImage)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
 {
 	CGRect _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, CGContextDrawImage_FUNC);
@@ -1469,7 +1469,7 @@ fail:
 
 #ifndef NO_CGContextEndTransparencyLayer
 JNIEXPORT void JNICALL OS_NATIVE(CGContextEndTransparencyLayer)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CGContextEndTransparencyLayer_FUNC);
 	CGContextEndTransparencyLayer((CGContextRef)arg0);
@@ -1479,7 +1479,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextEndTransparencyLayer)
 
 #ifndef NO_CGContextFillRect
 JNIEXPORT void JNICALL OS_NATIVE(CGContextFillRect)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
 {
 	CGRect _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, CGContextFillRect_FUNC);
@@ -1493,7 +1493,7 @@ fail:
 
 #ifndef NO_CGContextRelease
 JNIEXPORT void JNICALL OS_NATIVE(CGContextRelease)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CGContextRelease_FUNC);
 	CGContextRelease((CGContextRef)arg0);
@@ -1503,7 +1503,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextRelease)
 
 #ifndef NO_CGContextReplacePathWithStrokedPath
 JNIEXPORT void JNICALL OS_NATIVE(CGContextReplacePathWithStrokedPath)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CGContextReplacePathWithStrokedPath_FUNC);
 	CGContextReplacePathWithStrokedPath((CGContextRef)arg0);
@@ -1513,7 +1513,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextReplacePathWithStrokedPath)
 
 #ifndef NO_CGContextRestoreGState
 JNIEXPORT void JNICALL OS_NATIVE(CGContextRestoreGState)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CGContextRestoreGState_FUNC);
 	CGContextRestoreGState((CGContextRef)arg0);
@@ -1523,7 +1523,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextRestoreGState)
 
 #ifndef NO_CGContextSaveGState
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSaveGState)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CGContextSaveGState_FUNC);
 	CGContextSaveGState((CGContextRef)arg0);
@@ -1533,7 +1533,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSaveGState)
 
 #ifndef NO_CGContextScaleCTM
 JNIEXPORT void JNICALL OS_NATIVE(CGContextScaleCTM)
-	(JNIEnv *env, jclass that, jintLong arg0, jfloatDouble arg1, jfloatDouble arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2)
 {
 	OS_NATIVE_ENTER(env, that, CGContextScaleCTM_FUNC);
 	CGContextScaleCTM((CGContextRef)arg0, (CGFloat)arg1, (CGFloat)arg2);
@@ -1543,7 +1543,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextScaleCTM)
 
 #ifndef NO_CGContextSetBlendMode
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetBlendMode)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, CGContextSetBlendMode_FUNC);
 	CGContextSetBlendMode((CGContextRef)arg0, (CGBlendMode)arg1);
@@ -1553,21 +1553,21 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetBlendMode)
 
 #ifndef NO_CGContextSetFillColor
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetFillColor)
-	(JNIEnv *env, jclass that, jintLong arg0, jfloatDoubleArray arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1)
 {
-	jfloatDouble *lparg1=NULL;
+	jdouble *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, CGContextSetFillColor_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetFloatDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
 	CGContextSetFillColor((CGContextRef)arg0, (CGFloat*)lparg1);
 fail:
-	if (arg1 && lparg1) (*env)->ReleaseFloatDoubleArrayElements(env, arg1, lparg1, 0);
+	if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, CGContextSetFillColor_FUNC);
 }
 #endif
 
 #ifndef NO_CGContextSetFillColorSpace
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetFillColorSpace)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
 	OS_NATIVE_ENTER(env, that, CGContextSetFillColorSpace_FUNC);
 	CGContextSetFillColorSpace((CGContextRef)arg0, (CGColorSpaceRef)arg1);
@@ -1577,7 +1577,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetFillColorSpace)
 
 #ifndef NO_CGContextSetLineCap
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetLineCap)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, CGContextSetLineCap_FUNC);
 	CGContextSetLineCap((CGContextRef)arg0, (CGLineCap)arg1);
@@ -1587,7 +1587,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetLineCap)
 
 #ifndef NO_CGContextSetLineDash
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetLineDash)
-	(JNIEnv *env, jclass that, jintLong arg0, jfloatDouble arg1, jfloatArray arg2, jintLong arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jfloatArray arg2, jlong arg3)
 {
 	jfloat *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, CGContextSetLineDash_FUNC);
@@ -1601,7 +1601,7 @@ fail:
 
 #ifndef NO_CGContextSetLineJoin
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetLineJoin)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, CGContextSetLineJoin_FUNC);
 	CGContextSetLineJoin((CGContextRef)arg0, (CGLineJoin)arg1);
@@ -1611,7 +1611,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetLineJoin)
 
 #ifndef NO_CGContextSetLineWidth
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetLineWidth)
-	(JNIEnv *env, jclass that, jintLong arg0, jfloatDouble arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
 {
 	OS_NATIVE_ENTER(env, that, CGContextSetLineWidth_FUNC);
 	CGContextSetLineWidth((CGContextRef)arg0, (CGFloat)arg1);
@@ -1621,7 +1621,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetLineWidth)
 
 #ifndef NO_CGContextSetMiterLimit
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetMiterLimit)
-	(JNIEnv *env, jclass that, jintLong arg0, jfloatDouble arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1)
 {
 	OS_NATIVE_ENTER(env, that, CGContextSetMiterLimit_FUNC);
 	CGContextSetMiterLimit((CGContextRef)arg0, (CGFloat)arg1);
@@ -1631,7 +1631,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetMiterLimit)
 
 #ifndef NO_CGContextSetShouldAntialias
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetShouldAntialias)
-	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
 {
 	OS_NATIVE_ENTER(env, that, CGContextSetShouldAntialias_FUNC);
 	CGContextSetShouldAntialias((CGContextRef)arg0, (_Bool)arg1);
@@ -1641,7 +1641,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetShouldAntialias)
 
 #ifndef NO_CGContextSetTextDrawingMode
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetTextDrawingMode)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
 {
 	OS_NATIVE_ENTER(env, that, CGContextSetTextDrawingMode_FUNC);
 	CGContextSetTextDrawingMode((CGContextRef)arg0, (CGTextDrawingMode)arg1);
@@ -1651,7 +1651,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetTextDrawingMode)
 
 #ifndef NO_CGContextSetTextMatrix
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetTextMatrix)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
 {
 	CGAffineTransform _arg1, *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, CGContextSetTextMatrix_FUNC);
@@ -1665,7 +1665,7 @@ fail:
 
 #ifndef NO_CGContextSetTextPosition
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetTextPosition)
-	(JNIEnv *env, jclass that, jintLong arg0, jfloatDouble arg1, jfloatDouble arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2)
 {
 	OS_NATIVE_ENTER(env, that, CGContextSetTextPosition_FUNC);
 	CGContextSetTextPosition((CGContextRef)arg0, (CGFloat)arg1, (CGFloat)arg2);
@@ -1675,7 +1675,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetTextPosition)
 
 #ifndef NO_CGContextStrokePath
 JNIEXPORT void JNICALL OS_NATIVE(CGContextStrokePath)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CGContextStrokePath_FUNC);
 	CGContextStrokePath((CGContextRef)arg0);
@@ -1685,7 +1685,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextStrokePath)
 
 #ifndef NO_CGContextTranslateCTM
 JNIEXPORT void JNICALL OS_NATIVE(CGContextTranslateCTM)
-	(JNIEnv *env, jclass that, jintLong arg0, jfloatDouble arg1, jfloatDouble arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdouble arg2)
 {
 	OS_NATIVE_ENTER(env, that, CGContextTranslateCTM_FUNC);
 	CGContextTranslateCTM((CGContextRef)arg0, (CGFloat)arg1, (CGFloat)arg2);
@@ -1694,12 +1694,12 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextTranslateCTM)
 #endif
 
 #ifndef NO_CGDataProviderCreateWithData
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGDataProviderCreateWithData)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGDataProviderCreateWithData)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGDataProviderCreateWithData_FUNC);
-	rc = (jintLong)CGDataProviderCreateWithData((void*)arg0, (void*)arg1, (size_t)arg2, (CGDataProviderReleaseDataCallback)arg3);
+	rc = (jlong)CGDataProviderCreateWithData((void*)arg0, (void*)arg1, (size_t)arg2, (CGDataProviderReleaseDataCallback)arg3);
 	OS_NATIVE_EXIT(env, that, CGDataProviderCreateWithData_FUNC);
 	return rc;
 }
@@ -1707,7 +1707,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDataProviderCreateWithData)
 
 #ifndef NO_CGDataProviderRelease
 JNIEXPORT void JNICALL OS_NATIVE(CGDataProviderRelease)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CGDataProviderRelease_FUNC);
 	CGDataProviderRelease((CGDataProviderRef)arg0);
@@ -1716,18 +1716,18 @@ JNIEXPORT void JNICALL OS_NATIVE(CGDataProviderRelease)
 #endif
 
 #ifndef NO_CGDisplayBaseAddress
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayBaseAddress)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGDisplayBaseAddress)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGDisplayBaseAddress_FUNC);
 /*
-	rc = (jintLong)CGDisplayBaseAddress((CGDirectDisplayID)arg0);
+	rc = (jlong)CGDisplayBaseAddress((CGDirectDisplayID)arg0);
 */
 	{
 		OS_LOAD_FUNCTION(fp, CGDisplayBaseAddress)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CGDisplayBaseAddress_FUNC);
@@ -1736,18 +1736,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayBaseAddress)
 #endif
 
 #ifndef NO_CGDisplayBitsPerPixel
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayBitsPerPixel)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGDisplayBitsPerPixel)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGDisplayBitsPerPixel_FUNC);
 /*
-	rc = (jintLong)CGDisplayBitsPerPixel((CGDirectDisplayID)arg0);
+	rc = (jlong)CGDisplayBitsPerPixel((CGDirectDisplayID)arg0);
 */
 	{
 		OS_LOAD_FUNCTION(fp, CGDisplayBitsPerPixel)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CGDisplayBitsPerPixel_FUNC);
@@ -1756,18 +1756,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayBitsPerPixel)
 #endif
 
 #ifndef NO_CGDisplayBitsPerSample
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayBitsPerSample)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGDisplayBitsPerSample)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGDisplayBitsPerSample_FUNC);
 /*
-	rc = (jintLong)CGDisplayBitsPerSample((CGDirectDisplayID)arg0);
+	rc = (jlong)CGDisplayBitsPerSample((CGDirectDisplayID)arg0);
 */
 	{
 		OS_LOAD_FUNCTION(fp, CGDisplayBitsPerSample)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CGDisplayBitsPerSample_FUNC);
@@ -1776,18 +1776,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayBitsPerSample)
 #endif
 
 #ifndef NO_CGDisplayBytesPerRow
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayBytesPerRow)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGDisplayBytesPerRow)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGDisplayBytesPerRow_FUNC);
 /*
-	rc = (jintLong)CGDisplayBytesPerRow((CGDirectDisplayID)arg0);
+	rc = (jlong)CGDisplayBytesPerRow((CGDirectDisplayID)arg0);
 */
 	{
 		OS_LOAD_FUNCTION(fp, CGDisplayBytesPerRow)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CGDisplayBytesPerRow_FUNC);
@@ -1796,18 +1796,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayBytesPerRow)
 #endif
 
 #ifndef NO_CGDisplayCreateImage
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayCreateImage)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGDisplayCreateImage)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGDisplayCreateImage_FUNC);
 /*
-	rc = (jintLong)CGDisplayCreateImage((CGDirectDisplayID)arg0);
+	rc = (jlong)CGDisplayCreateImage((CGDirectDisplayID)arg0);
 */
 	{
 		OS_LOAD_FUNCTION(fp, CGDisplayCreateImage)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(CGDirectDisplayID))fp)((CGDirectDisplayID)arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CGDisplayCreateImage_FUNC);
@@ -1816,50 +1816,50 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayCreateImage)
 #endif
 
 #ifndef NO_CGDisplayPixelsHigh
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayPixelsHigh)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGDisplayPixelsHigh)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGDisplayPixelsHigh_FUNC);
-	rc = (jintLong)CGDisplayPixelsHigh((CGDirectDisplayID)arg0);
+	rc = (jlong)CGDisplayPixelsHigh((CGDirectDisplayID)arg0);
 	OS_NATIVE_EXIT(env, that, CGDisplayPixelsHigh_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CGDisplayPixelsWide
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGDisplayPixelsWide)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGDisplayPixelsWide)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGDisplayPixelsWide_FUNC);
-	rc = (jintLong)CGDisplayPixelsWide((CGDirectDisplayID)arg0);
+	rc = (jlong)CGDisplayPixelsWide((CGDirectDisplayID)arg0);
 	OS_NATIVE_EXIT(env, that, CGDisplayPixelsWide_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CGEventCreateKeyboardEvent
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGEventCreateKeyboardEvent)
-	(JNIEnv *env, jclass that, jintLong arg0, jshort arg1, jboolean arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGEventCreateKeyboardEvent)
+	(JNIEnv *env, jclass that, jlong arg0, jshort arg1, jboolean arg2)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGEventCreateKeyboardEvent_FUNC);
-	rc = (jintLong)CGEventCreateKeyboardEvent((CGEventSourceRef)arg0, (CGKeyCode)arg1, (_Bool)arg2);
+	rc = (jlong)CGEventCreateKeyboardEvent((CGEventSourceRef)arg0, (CGKeyCode)arg1, (_Bool)arg2);
 	OS_NATIVE_EXIT(env, that, CGEventCreateKeyboardEvent_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CGEventCreateMouseEvent
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGEventCreateMouseEvent)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2, jint arg3)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGEventCreateMouseEvent)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2, jint arg3)
 {
 	CGPoint _arg2, *lparg2=NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGEventCreateMouseEvent_FUNC);
 	if (arg2) if ((lparg2 = getCGPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)CGEventCreateMouseEvent((CGEventSourceRef)arg0, (CGEventType)arg1, *lparg2, (CGMouseButton)arg3);
+	rc = (jlong)CGEventCreateMouseEvent((CGEventSourceRef)arg0, (CGEventType)arg1, *lparg2, (CGMouseButton)arg3);
 fail:
 	if (arg2 && lparg2) setCGPointFields(env, arg2, lparg2);
 	OS_NATIVE_EXIT(env, that, CGEventCreateMouseEvent_FUNC);
@@ -1868,12 +1868,12 @@ fail:
 #endif
 
 #ifndef NO_CGEventCreateScrollWheelEvent
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGEventCreateScrollWheelEvent)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGEventCreateScrollWheelEvent)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jint arg3)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGEventCreateScrollWheelEvent_FUNC);
-	rc = (jintLong)CGEventCreateScrollWheelEvent((CGEventSourceRef)arg0, (CGScrollEventUnit)arg1, (CGWheelCount)arg2, (int32_t)arg3);
+	rc = (jlong)CGEventCreateScrollWheelEvent((CGEventSourceRef)arg0, (CGScrollEventUnit)arg1, (CGWheelCount)arg2, (int32_t)arg3);
 	OS_NATIVE_EXIT(env, that, CGEventCreateScrollWheelEvent_FUNC);
 	return rc;
 }
@@ -1881,7 +1881,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGEventCreateScrollWheelEvent)
 
 #ifndef NO_CGEventGetIntegerValueField
 JNIEXPORT jlong JNICALL OS_NATIVE(CGEventGetIntegerValueField)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
 {
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGEventGetIntegerValueField_FUNC);
@@ -1893,7 +1893,7 @@ JNIEXPORT jlong JNICALL OS_NATIVE(CGEventGetIntegerValueField)
 
 #ifndef NO_CGEventPost
 JNIEXPORT void JNICALL OS_NATIVE(CGEventPost)
-	(JNIEnv *env, jclass that, jint arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jint arg0, jlong arg1)
 {
 	OS_NATIVE_ENTER(env, that, CGEventPost_FUNC);
 	CGEventPost((CGEventTapLocation)arg0, (CGEventRef)arg1);
@@ -1902,12 +1902,12 @@ JNIEXPORT void JNICALL OS_NATIVE(CGEventPost)
 #endif
 
 #ifndef NO_CGEventSourceCreate
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGEventSourceCreate)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGEventSourceCreate)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGEventSourceCreate_FUNC);
-	rc = (jintLong)CGEventSourceCreate((CGEventSourceStateID)arg0);
+	rc = (jlong)CGEventSourceCreate((CGEventSourceStateID)arg0);
 	OS_NATIVE_EXIT(env, that, CGEventSourceCreate_FUNC);
 	return rc;
 }
@@ -1915,7 +1915,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGEventSourceCreate)
 
 #ifndef NO_CGGetDisplaysWithRect
 JNIEXPORT jint JNICALL OS_NATIVE(CGGetDisplaysWithRect)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jintLong arg2, jintLong arg3)
+	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jlong arg2, jlong arg3)
 {
 	CGRect _arg0, *lparg0=NULL;
 	jint rc = 0;
@@ -1930,36 +1930,36 @@ fail:
 #endif
 
 #ifndef NO_CGImageCreate
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGImageCreate)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jint arg6, jintLong arg7, jintLong arg8, jboolean arg9, jint arg10)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGImageCreate)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jint arg6, jlong arg7, jlong arg8, jboolean arg9, jint arg10)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGImageCreate_FUNC);
-	rc = (jintLong)CGImageCreate((size_t)arg0, (size_t)arg1, (size_t)arg2, (size_t)arg3, (size_t)arg4, (CGColorSpaceRef)arg5, (CGBitmapInfo)arg6, (CGDataProviderRef)arg7, (CGFloat*)arg8, (_Bool)arg9, (CGColorRenderingIntent)arg10);
+	rc = (jlong)CGImageCreate((size_t)arg0, (size_t)arg1, (size_t)arg2, (size_t)arg3, (size_t)arg4, (CGColorSpaceRef)arg5, (CGBitmapInfo)arg6, (CGDataProviderRef)arg7, (CGFloat*)arg8, (_Bool)arg9, (CGColorRenderingIntent)arg10);
 	OS_NATIVE_EXIT(env, that, CGImageCreate_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CGImageGetHeight
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGImageGetHeight)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGImageGetHeight)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGImageGetHeight_FUNC);
-	rc = (jintLong)CGImageGetHeight((CGImageRef)arg0);
+	rc = (jlong)CGImageGetHeight((CGImageRef)arg0);
 	OS_NATIVE_EXIT(env, that, CGImageGetHeight_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CGImageGetWidth
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGImageGetWidth)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGImageGetWidth)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGImageGetWidth_FUNC);
-	rc = (jintLong)CGImageGetWidth((CGImageRef)arg0);
+	rc = (jlong)CGImageGetWidth((CGImageRef)arg0);
 	OS_NATIVE_EXIT(env, that, CGImageGetWidth_FUNC);
 	return rc;
 }
@@ -1967,7 +1967,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CGImageGetWidth)
 
 #ifndef NO_CGImageRelease
 JNIEXPORT void JNICALL OS_NATIVE(CGImageRelease)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CGImageRelease_FUNC);
 	CGImageRelease((CGImageRef)arg0);
@@ -1977,7 +1977,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGImageRelease)
 
 #ifndef NO_CGPathAddCurveToPoint
 JNIEXPORT void JNICALL OS_NATIVE(CGPathAddCurveToPoint)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5, jfloatDouble arg6, jfloatDouble arg7)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5, jdouble arg6, jdouble arg7)
 {
 	OS_NATIVE_ENTER(env, that, CGPathAddCurveToPoint_FUNC);
 	CGPathAddCurveToPoint((CGMutablePathRef)arg0, (CGAffineTransform*)arg1, (CGFloat)arg2, (CGFloat)arg3, (CGFloat)arg4, (CGFloat)arg5, (CGFloat)arg6, (CGFloat)arg7);
@@ -1987,7 +1987,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGPathAddCurveToPoint)
 
 #ifndef NO_CGPathAddLineToPoint
 JNIEXPORT void JNICALL OS_NATIVE(CGPathAddLineToPoint)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jfloatDouble arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3)
 {
 	OS_NATIVE_ENTER(env, that, CGPathAddLineToPoint_FUNC);
 	CGPathAddLineToPoint((CGMutablePathRef)arg0, (CGAffineTransform*)arg1, (CGFloat)arg2, (CGFloat)arg3);
@@ -1997,7 +1997,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGPathAddLineToPoint)
 
 #ifndef NO_CGPathAddRect
 JNIEXPORT void JNICALL OS_NATIVE(CGPathAddRect)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2)
 {
 	CGRect _arg2, *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, CGPathAddRect_FUNC);
@@ -2011,7 +2011,7 @@ fail:
 
 #ifndef NO_CGPathApply
 JNIEXPORT void JNICALL OS_NATIVE(CGPathApply)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
 {
 	OS_NATIVE_ENTER(env, that, CGPathApply_FUNC);
 	CGPathApply((CGPathRef)arg0, (void*)arg1, (CGPathApplierFunction)arg2);
@@ -2021,7 +2021,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGPathApply)
 
 #ifndef NO_CGPathCloseSubpath
 JNIEXPORT void JNICALL OS_NATIVE(CGPathCloseSubpath)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CGPathCloseSubpath_FUNC);
 	CGPathCloseSubpath((CGMutablePathRef)arg0);
@@ -2030,24 +2030,24 @@ JNIEXPORT void JNICALL OS_NATIVE(CGPathCloseSubpath)
 #endif
 
 #ifndef NO_CGPathCreateCopy
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGPathCreateCopy)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGPathCreateCopy)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGPathCreateCopy_FUNC);
-	rc = (jintLong)CGPathCreateCopy((CGPathRef)arg0);
+	rc = (jlong)CGPathCreateCopy((CGPathRef)arg0);
 	OS_NATIVE_EXIT(env, that, CGPathCreateCopy_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CGPathCreateMutable
-JNIEXPORT jintLong JNICALL OS_NATIVE(CGPathCreateMutable)
+JNIEXPORT jlong JNICALL OS_NATIVE(CGPathCreateMutable)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGPathCreateMutable_FUNC);
-	rc = (jintLong)CGPathCreateMutable();
+	rc = (jlong)CGPathCreateMutable();
 	OS_NATIVE_EXIT(env, that, CGPathCreateMutable_FUNC);
 	return rc;
 }
@@ -2067,7 +2067,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGPathElement_1sizeof)
 
 #ifndef NO_CGPathMoveToPoint
 JNIEXPORT void JNICALL OS_NATIVE(CGPathMoveToPoint)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jfloatDouble arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3)
 {
 	OS_NATIVE_ENTER(env, that, CGPathMoveToPoint_FUNC);
 	CGPathMoveToPoint((CGMutablePathRef)arg0, (CGAffineTransform*)arg1, (CGFloat)arg2, (CGFloat)arg3);
@@ -2077,7 +2077,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CGPathMoveToPoint)
 
 #ifndef NO_CGPathRelease
 JNIEXPORT void JNICALL OS_NATIVE(CGPathRelease)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CGPathRelease_FUNC);
 	CGPathRelease((CGPathRef)arg0);
@@ -2175,7 +2175,7 @@ fail:
 
 #ifndef NO_CPSSetProcessName
 JNIEXPORT jint JNICALL OS_NATIVE(CPSSetProcessName)
-	(JNIEnv *env, jclass that, jintArray arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jintArray arg0, jlong arg1)
 {
 	jint *lparg0=NULL;
 	jint rc = 0;
@@ -2190,48 +2190,48 @@ fail:
 #endif
 
 #ifndef NO_CTFontGetAscent
-JNIEXPORT jfloatDouble JNICALL OS_NATIVE(CTFontGetAscent)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jdouble JNICALL OS_NATIVE(CTFontGetAscent)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jfloatDouble rc = 0;
+	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, CTFontGetAscent_FUNC);
-	rc = (jfloatDouble)CTFontGetAscent((CTFontRef)arg0);
+	rc = (jdouble)CTFontGetAscent((CTFontRef)arg0);
 	OS_NATIVE_EXIT(env, that, CTFontGetAscent_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CTFontGetDescent
-JNIEXPORT jfloatDouble JNICALL OS_NATIVE(CTFontGetDescent)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jdouble JNICALL OS_NATIVE(CTFontGetDescent)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jfloatDouble rc = 0;
+	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, CTFontGetDescent_FUNC);
-	rc = (jfloatDouble)CTFontGetDescent((CTFontRef)arg0);
+	rc = (jdouble)CTFontGetDescent((CTFontRef)arg0);
 	OS_NATIVE_EXIT(env, that, CTFontGetDescent_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CTFontGetLeading
-JNIEXPORT jfloatDouble JNICALL OS_NATIVE(CTFontGetLeading)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jdouble JNICALL OS_NATIVE(CTFontGetLeading)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jfloatDouble rc = 0;
+	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, CTFontGetLeading_FUNC);
-	rc = (jfloatDouble)CTFontGetLeading((CTFontRef)arg0);
+	rc = (jdouble)CTFontGetLeading((CTFontRef)arg0);
 	OS_NATIVE_EXIT(env, that, CTFontGetLeading_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CTLineCreateWithAttributedString
-JNIEXPORT jintLong JNICALL OS_NATIVE(CTLineCreateWithAttributedString)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CTLineCreateWithAttributedString)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CTLineCreateWithAttributedString_FUNC);
-	rc = (jintLong)CTLineCreateWithAttributedString((CFAttributedStringRef)arg0);
+	rc = (jlong)CTLineCreateWithAttributedString((CFAttributedStringRef)arg0);
 	OS_NATIVE_EXIT(env, that, CTLineCreateWithAttributedString_FUNC);
 	return rc;
 }
@@ -2239,7 +2239,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CTLineCreateWithAttributedString)
 
 #ifndef NO_CTLineDraw
 JNIEXPORT void JNICALL OS_NATIVE(CTLineDraw)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
 	OS_NATIVE_ENTER(env, that, CTLineDraw_FUNC);
 	CTLineDraw((CTLineRef)arg0, (CGContextRef)arg1);
@@ -2249,33 +2249,33 @@ JNIEXPORT void JNICALL OS_NATIVE(CTLineDraw)
 
 #ifndef NO_CTLineGetTypographicBounds
 JNIEXPORT jdouble JNICALL OS_NATIVE(CTLineGetTypographicBounds)
-	(JNIEnv *env, jclass that, jintLong arg0, jfloatDoubleArray arg1, jfloatDoubleArray arg2, jfloatDoubleArray arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jdoubleArray arg1, jdoubleArray arg2, jdoubleArray arg3)
 {
-	jfloatDouble *lparg1=NULL;
-	jfloatDouble *lparg2=NULL;
-	jfloatDouble *lparg3=NULL;
+	jdouble *lparg1=NULL;
+	jdouble *lparg2=NULL;
+	jdouble *lparg3=NULL;
 	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, CTLineGetTypographicBounds_FUNC);
-	if (arg1) if ((lparg1 = (*env)->GetFloatDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
-	if (arg2) if ((lparg2 = (*env)->GetFloatDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	if (arg3) if ((lparg3 = (*env)->GetFloatDoubleArrayElements(env, arg3, NULL)) == NULL) goto fail;
+	if (arg1) if ((lparg1 = (*env)->GetDoubleArrayElements(env, arg1, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg3) if ((lparg3 = (*env)->GetDoubleArrayElements(env, arg3, NULL)) == NULL) goto fail;
 	rc = (jdouble)CTLineGetTypographicBounds((CTLineRef)arg0, (CGFloat*)lparg1, (CGFloat*)lparg2, (CGFloat*)lparg3);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseFloatDoubleArrayElements(env, arg3, lparg3, 0);
-	if (arg2 && lparg2) (*env)->ReleaseFloatDoubleArrayElements(env, arg2, lparg2, 0);
-	if (arg1 && lparg1) (*env)->ReleaseFloatDoubleArrayElements(env, arg1, lparg1, 0);
+	if (arg3 && lparg3) (*env)->ReleaseDoubleArrayElements(env, arg3, lparg3, 0);
+	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
+	if (arg1 && lparg1) (*env)->ReleaseDoubleArrayElements(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, CTLineGetTypographicBounds_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CTParagraphStyleCreate
-JNIEXPORT jintLong JNICALL OS_NATIVE(CTParagraphStyleCreate)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(CTParagraphStyleCreate)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CTParagraphStyleCreate_FUNC);
-	rc = (jintLong)CTParagraphStyleCreate((CTParagraphStyleSetting*)arg0, (size_t)arg1);
+	rc = (jlong)CTParagraphStyleCreate((CTParagraphStyleSetting*)arg0, (size_t)arg1);
 	OS_NATIVE_EXIT(env, that, CTParagraphStyleCreate_FUNC);
 	return rc;
 }
@@ -2294,14 +2294,14 @@ JNIEXPORT jint JNICALL OS_NATIVE(CTParagraphStyleSetting_1sizeof)
 #endif
 
 #ifndef NO_CTTypesetterCreateLine
-JNIEXPORT jintLong JNICALL OS_NATIVE(CTTypesetterCreateLine)
-	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(CTTypesetterCreateLine)
+	(JNIEnv *env, jclass that, jlong arg0, jobject arg1)
 {
 	CFRange _arg1, *lparg1=NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CTTypesetterCreateLine_FUNC);
 	if (arg1) if ((lparg1 = getCFRangeFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jintLong)CTTypesetterCreateLine((CTTypesetterRef)arg0, *lparg1);
+	rc = (jlong)CTTypesetterCreateLine((CTTypesetterRef)arg0, *lparg1);
 fail:
 	if (arg1 && lparg1) setCFRangeFields(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, CTTypesetterCreateLine_FUNC);
@@ -2310,24 +2310,24 @@ fail:
 #endif
 
 #ifndef NO_CTTypesetterCreateWithAttributedString
-JNIEXPORT jintLong JNICALL OS_NATIVE(CTTypesetterCreateWithAttributedString)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(CTTypesetterCreateWithAttributedString)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CTTypesetterCreateWithAttributedString_FUNC);
-	rc = (jintLong)CTTypesetterCreateWithAttributedString((CFAttributedStringRef)arg0);
+	rc = (jlong)CTTypesetterCreateWithAttributedString((CFAttributedStringRef)arg0);
 	OS_NATIVE_EXIT(env, that, CTTypesetterCreateWithAttributedString_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_CTTypesetterSuggestLineBreak
-JNIEXPORT jintLong JNICALL OS_NATIVE(CTTypesetterSuggestLineBreak)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(CTTypesetterSuggestLineBreak)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CTTypesetterSuggestLineBreak_FUNC);
-	rc = (jintLong)CTTypesetterSuggestLineBreak((CTTypesetterRef)arg0, (CFIndex)arg1, (double)arg2);
+	rc = (jlong)CTTypesetterSuggestLineBreak((CTTypesetterRef)arg0, (CFIndex)arg1, (double)arg2);
 	OS_NATIVE_EXIT(env, that, CTTypesetterSuggestLineBreak_FUNC);
 	return rc;
 }
@@ -2335,7 +2335,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CTTypesetterSuggestLineBreak)
 
 #ifndef NO_CancelMenuTracking
 JNIEXPORT jint JNICALL OS_NATIVE(CancelMenuTracking)
-	(JNIEnv *env, jclass that, jintLong arg0, jboolean arg1, jint arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jboolean arg1, jint arg2)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CancelMenuTracking_FUNC);
@@ -2345,7 +2345,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CancelMenuTracking)
 	{
 		OS_LOAD_FUNCTION(fp, CancelMenuTracking)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jboolean, jint))fp)(arg0, arg1, arg2);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jboolean, jint))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CancelMenuTracking_FUNC);
@@ -2355,7 +2355,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CancelMenuTracking)
 
 #ifndef NO_CloseRgn
 JNIEXPORT void JNICALL OS_NATIVE(CloseRgn)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, CloseRgn_FUNC);
 /*
@@ -2364,7 +2364,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CloseRgn)
 	{
 		OS_LOAD_FUNCTION(fp, CloseRgn)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+			((void (CALLING_CONVENTION*)(jlong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CloseRgn_FUNC);
@@ -2373,7 +2373,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CloseRgn)
 
 #ifndef NO_CopyRgn
 JNIEXPORT void JNICALL OS_NATIVE(CopyRgn)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
 	OS_NATIVE_ENTER(env, that, CopyRgn_FUNC);
 /*
@@ -2382,7 +2382,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CopyRgn)
 	{
 		OS_LOAD_FUNCTION(fp, CopyRgn)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1);
+			((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, CopyRgn_FUNC);
@@ -2391,7 +2391,7 @@ JNIEXPORT void JNICALL OS_NATIVE(CopyRgn)
 
 #ifndef NO_DeleteGlobalRef
 JNIEXPORT void JNICALL OS_NATIVE(DeleteGlobalRef)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, DeleteGlobalRef_FUNC);
 	(*env)->DeleteGlobalRef(env, (jobject)arg0);
@@ -2401,7 +2401,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DeleteGlobalRef)
 
 #ifndef NO_DeleteMenuItem
 JNIEXPORT void JNICALL OS_NATIVE(DeleteMenuItem)
-	(JNIEnv *env, jclass that, jintLong arg0, jshort arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jshort arg1)
 {
 	OS_NATIVE_ENTER(env, that, DeleteMenuItem_FUNC);
 /*
@@ -2419,7 +2419,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DeleteMenuItem)
 
 #ifndef NO_DiffRgn
 JNIEXPORT void JNICALL OS_NATIVE(DiffRgn)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
 {
 	OS_NATIVE_ENTER(env, that, DiffRgn_FUNC);
 /*
@@ -2428,7 +2428,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DiffRgn)
 	{
 		OS_LOAD_FUNCTION(fp, DiffRgn)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2);
+			((void (CALLING_CONVENTION*)(jlong, jlong, jlong))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, DiffRgn_FUNC);
@@ -2437,7 +2437,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DiffRgn)
 
 #ifndef NO_DisposeRgn
 JNIEXPORT void JNICALL OS_NATIVE(DisposeRgn)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, DisposeRgn_FUNC);
 /*
@@ -2446,7 +2446,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DisposeRgn)
 	{
 		OS_LOAD_FUNCTION(fp, DisposeRgn)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+			((void (CALLING_CONVENTION*)(jlong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, DisposeRgn_FUNC);
@@ -2455,7 +2455,7 @@ JNIEXPORT void JNICALL OS_NATIVE(DisposeRgn)
 
 #ifndef NO_EmptyRgn
 JNIEXPORT jboolean JNICALL OS_NATIVE(EmptyRgn)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, EmptyRgn_FUNC);
@@ -2465,7 +2465,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EmptyRgn)
 	{
 		OS_LOAD_FUNCTION(fp, EmptyRgn)
 		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jlong))fp)(arg0);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, EmptyRgn_FUNC);
@@ -2475,7 +2475,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(EmptyRgn)
 
 #ifndef NO_FSPathMakeRef
 JNIEXPORT jint JNICALL OS_NATIVE(FSPathMakeRef)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbooleanArray arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbooleanArray arg2)
 {
 	jbyte *lparg1=NULL;
 	jboolean *lparg2=NULL;
@@ -2574,12 +2574,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetDblTime)
 
 #ifndef NO_GetIconRefFromTypeInfo
 JNIEXPORT jint JNICALL OS_NATIVE(GetIconRefFromTypeInfo)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jintLong arg3, jint arg4, jintLongArray arg5)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5)
 {
-	jintLong *lparg5=NULL;
+	jlong *lparg5=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetIconRefFromTypeInfo_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)GetIconRefFromTypeInfo((OSType)arg0, (OSType)arg1, (CFStringRef)arg2, (CFStringRef)arg3, (IconServicesUsageFlags)arg4, (IconRef *)lparg5);
 */
@@ -2590,7 +2590,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetIconRefFromTypeInfo)
 		}
 	}
 fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
+	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
 	OS_NATIVE_EXIT(env, that, GetIconRefFromTypeInfo_FUNC);
 	return rc;
 }
@@ -2598,13 +2598,13 @@ fail:
 
 #ifndef NO_GetIndMenuItemWithCommandID
 JNIEXPORT jint JNICALL OS_NATIVE(GetIndMenuItemWithCommandID)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jintLongArray arg3, jshortArray arg4)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jint arg2, jlongArray arg3, jshortArray arg4)
 {
-	jintLong *lparg3=NULL;
+	jlong *lparg3=NULL;
 	jshort *lparg4=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, GetIndMenuItemWithCommandID_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;
 	if (arg4) if ((lparg4 = (*env)->GetShortArrayElements(env, arg4, NULL)) == NULL) goto fail;
 /*
 	rc = (jint)GetIndMenuItemWithCommandID((MenuRef)arg0, (MenuCommand)arg1, (UInt32)arg2, (MenuRef *)lparg3, (MenuItemIndex *)lparg4);
@@ -2617,7 +2617,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(GetIndMenuItemWithCommandID)
 	}
 fail:
 	if (arg4 && lparg4) (*env)->ReleaseShortArrayElements(env, arg4, lparg4, 0);
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
 	OS_NATIVE_EXIT(env, that, GetIndMenuItemWithCommandID_FUNC);
 	return rc;
 }
@@ -2625,7 +2625,7 @@ fail:
 
 #ifndef NO_GetRegionBounds
 JNIEXPORT void JNICALL OS_NATIVE(GetRegionBounds)
-	(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jshortArray arg1)
 {
 	jshort *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, GetRegionBounds_FUNC);
@@ -2636,7 +2636,7 @@ JNIEXPORT void JNICALL OS_NATIVE(GetRegionBounds)
 	{
 		OS_LOAD_FUNCTION(fp, GetRegionBounds)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jshort *))fp)(arg0, lparg1);
+			((void (CALLING_CONVENTION*)(jlong, jshort *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -2696,7 +2696,7 @@ fail:
 
 #ifndef NO_HIThemeDrawFocusRect
 JNIEXPORT jint JNICALL OS_NATIVE(HIThemeDrawFocusRect)
-	(JNIEnv *env, jclass that, jobject arg0, jboolean arg1, jintLong arg2, jint arg3)
+	(JNIEnv *env, jclass that, jobject arg0, jboolean arg1, jlong arg2, jint arg3)
 {
 	CGRect _arg0, *lparg0=NULL;
 	jint rc = 0;
@@ -2720,7 +2720,7 @@ fail:
 
 #ifndef NO_HIWindowGetCGWindowID
 JNIEXPORT jint JNICALL OS_NATIVE(HIWindowGetCGWindowID)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, HIWindowGetCGWindowID_FUNC);
@@ -2739,30 +2739,30 @@ JNIEXPORT jint JNICALL OS_NATIVE(HIWindowGetCGWindowID)
 #endif
 
 #ifndef NO_JSEvaluateScript
-JNIEXPORT jintLong JNICALL OS_NATIVE(JSEvaluateScript)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jint arg4, jintLongArray arg5)
+JNIEXPORT jlong JNICALL OS_NATIVE(JSEvaluateScript)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jlongArray arg5)
 {
-	jintLong *lparg5=NULL;
-	jintLong rc = 0;
+	jlong *lparg5=NULL;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, JSEvaluateScript_FUNC);
-	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jintLong)JSEvaluateScript((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5);
+	if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	rc = (jlong)JSEvaluateScript((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5);
 fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
+	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
 	OS_NATIVE_EXIT(env, that, JSEvaluateScript_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_JSStringCreateWithUTF8CString
-JNIEXPORT jintLong JNICALL OS_NATIVE(JSStringCreateWithUTF8CString)
+JNIEXPORT jlong JNICALL OS_NATIVE(JSStringCreateWithUTF8CString)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, JSStringCreateWithUTF8CString_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)JSStringCreateWithUTF8CString((const char *)lparg0);
+	rc = (jlong)JSStringCreateWithUTF8CString((const char *)lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, JSStringCreateWithUTF8CString_FUNC);
@@ -2772,7 +2772,7 @@ fail:
 
 #ifndef NO_JSStringRelease
 JNIEXPORT void JNICALL OS_NATIVE(JSStringRelease)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, JSStringRelease_FUNC);
 	JSStringRelease((JSStringRef)arg0);
@@ -2801,16 +2801,16 @@ JNIEXPORT jbyte JNICALL OS_NATIVE(LMGetKbdType)
 #endif
 
 #ifndef NO_LSGetApplicationForInfo
-JNIEXPORT jintLong JNICALL OS_NATIVE(LSGetApplicationForInfo)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintLong arg2, jint arg3, jbyteArray arg4, jintArray arg5)
+JNIEXPORT jlong JNICALL OS_NATIVE(LSGetApplicationForInfo)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jlong arg2, jint arg3, jbyteArray arg4, jintArray arg5)
 {
 	jbyte *lparg4=NULL;
 	jint *lparg5=NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, LSGetApplicationForInfo_FUNC);
 	if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail;
 	if (arg5) if ((lparg5 = (*env)->GetIntArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jintLong)LSGetApplicationForInfo((OSType)arg0, (OSType)arg1, (CFStringRef)arg2, (LSRolesMask)arg3, (FSRef *)lparg4, (CFURLRef *)lparg5);
+	rc = (jlong)LSGetApplicationForInfo((OSType)arg0, (OSType)arg1, (CFStringRef)arg2, (LSRolesMask)arg3, (FSRef *)lparg4, (CFURLRef *)lparg5);
 fail:
 	if (arg5 && lparg5) (*env)->ReleaseIntArrayElements(env, arg5, lparg5, 0);
 	if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0);
@@ -2856,708 +2856,708 @@ JNIEXPORT void JNICALL OS_NATIVE(MoveTo)
 #endif
 
 #ifndef NO_NSAccessibilityActionDescription
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityActionDescription)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityActionDescription)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityActionDescription_FUNC);
-	rc = (jintLong)NSAccessibilityActionDescription((NSString*)arg0);
+	rc = (jlong)NSAccessibilityActionDescription((NSString*)arg0);
 	OS_NATIVE_EXIT(env, that, NSAccessibilityActionDescription_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityAttributedStringForRangeParameterizedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityAttributedStringForRangeParameterizedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityAttributedStringForRangeParameterizedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityAttributedStringForRangeParameterizedAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityAttributedStringForRangeParameterizedAttribute;
+	rc = (jlong)NSAccessibilityAttributedStringForRangeParameterizedAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityAttributedStringForRangeParameterizedAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityBackgroundColorTextAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityBackgroundColorTextAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityBackgroundColorTextAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityBackgroundColorTextAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityBackgroundColorTextAttribute;
+	rc = (jlong)NSAccessibilityBackgroundColorTextAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityBackgroundColorTextAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityBoundsForRangeParameterizedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityBoundsForRangeParameterizedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityBoundsForRangeParameterizedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityBoundsForRangeParameterizedAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityBoundsForRangeParameterizedAttribute;
+	rc = (jlong)NSAccessibilityBoundsForRangeParameterizedAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityBoundsForRangeParameterizedAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityButtonRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityButtonRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityButtonRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityButtonRole_FUNC);
-	rc = (jintLong)NSAccessibilityButtonRole;
+	rc = (jlong)NSAccessibilityButtonRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityButtonRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityCheckBoxRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityCheckBoxRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityCheckBoxRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityCheckBoxRole_FUNC);
-	rc = (jintLong)NSAccessibilityCheckBoxRole;
+	rc = (jlong)NSAccessibilityCheckBoxRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityCheckBoxRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityChildrenAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityChildrenAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityChildrenAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityChildrenAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityChildrenAttribute;
+	rc = (jlong)NSAccessibilityChildrenAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityChildrenAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityColorWellRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityColorWellRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityColorWellRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityColorWellRole_FUNC);
-	rc = (jintLong)NSAccessibilityColorWellRole;
+	rc = (jlong)NSAccessibilityColorWellRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityColorWellRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityColumnRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityColumnRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityColumnRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityColumnRole_FUNC);
-	rc = (jintLong)NSAccessibilityColumnRole;
+	rc = (jlong)NSAccessibilityColumnRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityColumnRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityColumnsAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityColumnsAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityColumnsAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityColumnsAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityColumnsAttribute;
+	rc = (jlong)NSAccessibilityColumnsAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityColumnsAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityComboBoxRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityComboBoxRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityComboBoxRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityComboBoxRole_FUNC);
-	rc = (jintLong)NSAccessibilityComboBoxRole;
+	rc = (jlong)NSAccessibilityComboBoxRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityComboBoxRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityConfirmAction
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityConfirmAction)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityConfirmAction)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityConfirmAction_FUNC);
-	rc = (jintLong)NSAccessibilityConfirmAction;
+	rc = (jlong)NSAccessibilityConfirmAction;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityConfirmAction_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityContentsAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityContentsAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityContentsAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityContentsAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityContentsAttribute;
+	rc = (jlong)NSAccessibilityContentsAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityContentsAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityDescriptionAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityDescriptionAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityDescriptionAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityDescriptionAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityDescriptionAttribute;
+	rc = (jlong)NSAccessibilityDescriptionAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityDescriptionAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityDialogSubrole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityDialogSubrole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityDialogSubrole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityDialogSubrole_FUNC);
-	rc = (jintLong)NSAccessibilityDialogSubrole;
+	rc = (jlong)NSAccessibilityDialogSubrole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityDialogSubrole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityEnabledAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityEnabledAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityEnabledAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityEnabledAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityEnabledAttribute;
+	rc = (jlong)NSAccessibilityEnabledAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityEnabledAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityExpandedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityExpandedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityExpandedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityExpandedAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityExpandedAttribute;
+	rc = (jlong)NSAccessibilityExpandedAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityExpandedAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityFloatingWindowSubrole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityFloatingWindowSubrole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityFloatingWindowSubrole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityFloatingWindowSubrole_FUNC);
-	rc = (jintLong)NSAccessibilityFloatingWindowSubrole;
+	rc = (jlong)NSAccessibilityFloatingWindowSubrole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityFloatingWindowSubrole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityFocusedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityFocusedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityFocusedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityFocusedAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityFocusedAttribute;
+	rc = (jlong)NSAccessibilityFocusedAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityFocusedAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityFocusedUIElementChangedNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityFocusedUIElementChangedNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityFocusedUIElementChangedNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityFocusedUIElementChangedNotification_FUNC);
-	rc = (jintLong)NSAccessibilityFocusedUIElementChangedNotification;
+	rc = (jlong)NSAccessibilityFocusedUIElementChangedNotification;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityFocusedUIElementChangedNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityFocusedWindowChangedNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityFocusedWindowChangedNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityFocusedWindowChangedNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityFocusedWindowChangedNotification_FUNC);
-	rc = (jintLong)NSAccessibilityFocusedWindowChangedNotification;
+	rc = (jlong)NSAccessibilityFocusedWindowChangedNotification;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityFocusedWindowChangedNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityFontFamilyKey
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityFontFamilyKey)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityFontFamilyKey)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityFontFamilyKey_FUNC);
-	rc = (jintLong)NSAccessibilityFontFamilyKey;
+	rc = (jlong)NSAccessibilityFontFamilyKey;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityFontFamilyKey_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityFontNameKey
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityFontNameKey)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityFontNameKey)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityFontNameKey_FUNC);
-	rc = (jintLong)NSAccessibilityFontNameKey;
+	rc = (jlong)NSAccessibilityFontNameKey;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityFontNameKey_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityFontSizeKey
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityFontSizeKey)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityFontSizeKey)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityFontSizeKey_FUNC);
-	rc = (jintLong)NSAccessibilityFontSizeKey;
+	rc = (jlong)NSAccessibilityFontSizeKey;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityFontSizeKey_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityFontTextAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityFontTextAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityFontTextAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityFontTextAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityFontTextAttribute;
+	rc = (jlong)NSAccessibilityFontTextAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityFontTextAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityForegroundColorTextAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityForegroundColorTextAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityForegroundColorTextAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityForegroundColorTextAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityForegroundColorTextAttribute;
+	rc = (jlong)NSAccessibilityForegroundColorTextAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityForegroundColorTextAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityGridRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityGridRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityGridRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityGridRole_FUNC);
-	rc = (jintLong)NSAccessibilityGridRole;
+	rc = (jlong)NSAccessibilityGridRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityGridRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityGroupRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityGroupRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityGroupRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityGroupRole_FUNC);
-	rc = (jintLong)NSAccessibilityGroupRole;
+	rc = (jlong)NSAccessibilityGroupRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityGroupRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityHeaderAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityHeaderAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityHeaderAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityHeaderAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityHeaderAttribute;
+	rc = (jlong)NSAccessibilityHeaderAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityHeaderAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityHelpAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityHelpAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityHelpAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityHelpAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityHelpAttribute;
+	rc = (jlong)NSAccessibilityHelpAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityHelpAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityHelpTagRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityHelpTagRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityHelpTagRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityHelpTagRole_FUNC);
-	rc = (jintLong)NSAccessibilityHelpTagRole;
+	rc = (jlong)NSAccessibilityHelpTagRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityHelpTagRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityHorizontalOrientationValue
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityHorizontalOrientationValue)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityHorizontalOrientationValue)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityHorizontalOrientationValue_FUNC);
-	rc = (jintLong)NSAccessibilityHorizontalOrientationValue;
+	rc = (jlong)NSAccessibilityHorizontalOrientationValue;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityHorizontalOrientationValue_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityHorizontalScrollBarAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityHorizontalScrollBarAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityHorizontalScrollBarAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityHorizontalScrollBarAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityHorizontalScrollBarAttribute;
+	rc = (jlong)NSAccessibilityHorizontalScrollBarAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityHorizontalScrollBarAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityImageRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityImageRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityImageRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityImageRole_FUNC);
-	rc = (jintLong)NSAccessibilityImageRole;
+	rc = (jlong)NSAccessibilityImageRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityImageRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityIncrementorRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityIncrementorRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityIncrementorRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityIncrementorRole_FUNC);
-	rc = (jintLong)NSAccessibilityIncrementorRole;
+	rc = (jlong)NSAccessibilityIncrementorRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityIncrementorRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityIndexAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityIndexAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityIndexAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityIndexAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityIndexAttribute;
+	rc = (jlong)NSAccessibilityIndexAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityIndexAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityInsertionPointLineNumberAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityInsertionPointLineNumberAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityInsertionPointLineNumberAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityInsertionPointLineNumberAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityInsertionPointLineNumberAttribute;
+	rc = (jlong)NSAccessibilityInsertionPointLineNumberAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityInsertionPointLineNumberAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityLabelValueAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityLabelValueAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityLabelValueAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityLabelValueAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityLabelValueAttribute;
+	rc = (jlong)NSAccessibilityLabelValueAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityLabelValueAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityLineForIndexParameterizedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityLineForIndexParameterizedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityLineForIndexParameterizedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityLineForIndexParameterizedAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityLineForIndexParameterizedAttribute;
+	rc = (jlong)NSAccessibilityLineForIndexParameterizedAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityLineForIndexParameterizedAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityLinkRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityLinkRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityLinkRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityLinkRole_FUNC);
-	rc = (jintLong)NSAccessibilityLinkRole;
+	rc = (jlong)NSAccessibilityLinkRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityLinkRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityLinkTextAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityLinkTextAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityLinkTextAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityLinkTextAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityLinkTextAttribute;
+	rc = (jlong)NSAccessibilityLinkTextAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityLinkTextAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityLinkedUIElementsAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityLinkedUIElementsAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityLinkedUIElementsAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityLinkedUIElementsAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityLinkedUIElementsAttribute;
+	rc = (jlong)NSAccessibilityLinkedUIElementsAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityLinkedUIElementsAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityListRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityListRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityListRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityListRole_FUNC);
-	rc = (jintLong)NSAccessibilityListRole;
+	rc = (jlong)NSAccessibilityListRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityListRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityMaxValueAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityMaxValueAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityMaxValueAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityMaxValueAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityMaxValueAttribute;
+	rc = (jlong)NSAccessibilityMaxValueAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityMaxValueAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityMenuBarRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityMenuBarRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityMenuBarRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityMenuBarRole_FUNC);
-	rc = (jintLong)NSAccessibilityMenuBarRole;
+	rc = (jlong)NSAccessibilityMenuBarRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityMenuBarRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityMenuButtonRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityMenuButtonRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityMenuButtonRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityMenuButtonRole_FUNC);
-	rc = (jintLong)NSAccessibilityMenuButtonRole;
+	rc = (jlong)NSAccessibilityMenuButtonRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityMenuButtonRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityMenuItemRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityMenuItemRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityMenuItemRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityMenuItemRole_FUNC);
-	rc = (jintLong)NSAccessibilityMenuItemRole;
+	rc = (jlong)NSAccessibilityMenuItemRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityMenuItemRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityMenuRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityMenuRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityMenuRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityMenuRole_FUNC);
-	rc = (jintLong)NSAccessibilityMenuRole;
+	rc = (jlong)NSAccessibilityMenuRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityMenuRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityMinValueAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityMinValueAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityMinValueAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityMinValueAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityMinValueAttribute;
+	rc = (jlong)NSAccessibilityMinValueAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityMinValueAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityMisspelledTextAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityMisspelledTextAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityMisspelledTextAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityMisspelledTextAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityMisspelledTextAttribute;
+	rc = (jlong)NSAccessibilityMisspelledTextAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityMisspelledTextAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityMovedNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityMovedNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityMovedNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityMovedNotification_FUNC);
-	rc = (jintLong)NSAccessibilityMovedNotification;
+	rc = (jlong)NSAccessibilityMovedNotification;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityMovedNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityNextContentsAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityNextContentsAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityNextContentsAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityNextContentsAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityNextContentsAttribute;
+	rc = (jlong)NSAccessibilityNextContentsAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityNextContentsAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityNumberOfCharactersAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityNumberOfCharactersAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityNumberOfCharactersAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityNumberOfCharactersAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityNumberOfCharactersAttribute;
+	rc = (jlong)NSAccessibilityNumberOfCharactersAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityNumberOfCharactersAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityOrientationAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityOrientationAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityOrientationAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityOrientationAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityOrientationAttribute;
+	rc = (jlong)NSAccessibilityOrientationAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityOrientationAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityOutlineRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityOutlineRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityOutlineRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityOutlineRole_FUNC);
-	rc = (jintLong)NSAccessibilityOutlineRole;
+	rc = (jlong)NSAccessibilityOutlineRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityOutlineRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityOutlineRowSubrole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityOutlineRowSubrole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityOutlineRowSubrole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityOutlineRowSubrole_FUNC);
-	rc = (jintLong)NSAccessibilityOutlineRowSubrole;
+	rc = (jlong)NSAccessibilityOutlineRowSubrole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityOutlineRowSubrole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityParentAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityParentAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityParentAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityParentAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityParentAttribute;
+	rc = (jlong)NSAccessibilityParentAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityParentAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityPopUpButtonRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityPopUpButtonRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityPopUpButtonRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityPopUpButtonRole_FUNC);
-	rc = (jintLong)NSAccessibilityPopUpButtonRole;
+	rc = (jlong)NSAccessibilityPopUpButtonRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityPopUpButtonRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityPositionAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityPositionAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityPositionAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityPositionAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityPositionAttribute;
+	rc = (jlong)NSAccessibilityPositionAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityPositionAttribute_FUNC);
 	return rc;
 }
@@ -3565,7 +3565,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityPositionAttribute)
 
 #ifndef NO_NSAccessibilityPostNotification
 JNIEXPORT void JNICALL OS_NATIVE(NSAccessibilityPostNotification)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
 	OS_NATIVE_ENTER(env, that, NSAccessibilityPostNotification_FUNC);
 	NSAccessibilityPostNotification((id)arg0, (NSString*)arg1);
@@ -3574,72 +3574,72 @@ JNIEXPORT void JNICALL OS_NATIVE(NSAccessibilityPostNotification)
 #endif
 
 #ifndef NO_NSAccessibilityPressAction
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityPressAction)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityPressAction)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityPressAction_FUNC);
-	rc = (jintLong)NSAccessibilityPressAction;
+	rc = (jlong)NSAccessibilityPressAction;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityPressAction_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityPreviousContentsAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityPreviousContentsAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityPreviousContentsAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityPreviousContentsAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityPreviousContentsAttribute;
+	rc = (jlong)NSAccessibilityPreviousContentsAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityPreviousContentsAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityProgressIndicatorRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityProgressIndicatorRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityProgressIndicatorRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityProgressIndicatorRole_FUNC);
-	rc = (jintLong)NSAccessibilityProgressIndicatorRole;
+	rc = (jlong)NSAccessibilityProgressIndicatorRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityProgressIndicatorRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityRTFForRangeParameterizedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRTFForRangeParameterizedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRTFForRangeParameterizedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRTFForRangeParameterizedAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityRTFForRangeParameterizedAttribute;
+	rc = (jlong)NSAccessibilityRTFForRangeParameterizedAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRTFForRangeParameterizedAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityRadioButtonRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRadioButtonRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRadioButtonRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRadioButtonRole_FUNC);
-	rc = (jintLong)NSAccessibilityRadioButtonRole;
+	rc = (jlong)NSAccessibilityRadioButtonRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRadioButtonRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityRadioGroupRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRadioGroupRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRadioGroupRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRadioGroupRole_FUNC);
-	rc = (jintLong)NSAccessibilityRadioGroupRole;
+	rc = (jlong)NSAccessibilityRadioGroupRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRadioGroupRole_FUNC);
 	return rc;
 }
@@ -3647,7 +3647,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRadioGroupRole)
 
 #ifndef NO_NSAccessibilityRaiseBadArgumentException
 JNIEXPORT void JNICALL OS_NATIVE(NSAccessibilityRaiseBadArgumentException)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
 {
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRaiseBadArgumentException_FUNC);
 	NSAccessibilityRaiseBadArgumentException((id)arg0, (NSString*)arg1, (id)arg2);
@@ -3656,864 +3656,864 @@ JNIEXPORT void JNICALL OS_NATIVE(NSAccessibilityRaiseBadArgumentException)
 #endif
 
 #ifndef NO_NSAccessibilityRangeForIndexParameterizedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRangeForIndexParameterizedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRangeForIndexParameterizedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRangeForIndexParameterizedAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityRangeForIndexParameterizedAttribute;
+	rc = (jlong)NSAccessibilityRangeForIndexParameterizedAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRangeForIndexParameterizedAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityRangeForLineParameterizedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRangeForLineParameterizedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRangeForLineParameterizedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRangeForLineParameterizedAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityRangeForLineParameterizedAttribute;
+	rc = (jlong)NSAccessibilityRangeForLineParameterizedAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRangeForLineParameterizedAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityRangeForPositionParameterizedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRangeForPositionParameterizedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRangeForPositionParameterizedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRangeForPositionParameterizedAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityRangeForPositionParameterizedAttribute;
+	rc = (jlong)NSAccessibilityRangeForPositionParameterizedAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRangeForPositionParameterizedAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityResizedNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityResizedNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityResizedNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityResizedNotification_FUNC);
-	rc = (jintLong)NSAccessibilityResizedNotification;
+	rc = (jlong)NSAccessibilityResizedNotification;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityResizedNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityRoleAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRoleAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRoleAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRoleAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityRoleAttribute;
+	rc = (jlong)NSAccessibilityRoleAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRoleAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityRoleDescription
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRoleDescription)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRoleDescription)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRoleDescription_FUNC);
-	rc = (jintLong)NSAccessibilityRoleDescription((NSString*)arg0, (NSString*)arg1);
+	rc = (jlong)NSAccessibilityRoleDescription((NSString*)arg0, (NSString*)arg1);
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRoleDescription_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityRoleDescriptionAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRoleDescriptionAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRoleDescriptionAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRoleDescriptionAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityRoleDescriptionAttribute;
+	rc = (jlong)NSAccessibilityRoleDescriptionAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRoleDescriptionAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityRoleDescriptionForUIElement
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRoleDescriptionForUIElement)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRoleDescriptionForUIElement)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRoleDescriptionForUIElement_FUNC);
-	rc = (jintLong)NSAccessibilityRoleDescriptionForUIElement((id)arg0);
+	rc = (jlong)NSAccessibilityRoleDescriptionForUIElement((id)arg0);
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRoleDescriptionForUIElement_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityRowCountChangedNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRowCountChangedNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRowCountChangedNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRowCountChangedNotification_FUNC);
-	rc = (jintLong)NSAccessibilityRowCountChangedNotification;
+	rc = (jlong)NSAccessibilityRowCountChangedNotification;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRowCountChangedNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityRowRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRowRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRowRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRowRole_FUNC);
-	rc = (jintLong)NSAccessibilityRowRole;
+	rc = (jlong)NSAccessibilityRowRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRowRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityRowsAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityRowsAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityRowsAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityRowsAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityRowsAttribute;
+	rc = (jlong)NSAccessibilityRowsAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityRowsAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityScrollAreaRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityScrollAreaRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityScrollAreaRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityScrollAreaRole_FUNC);
-	rc = (jintLong)NSAccessibilityScrollAreaRole;
+	rc = (jlong)NSAccessibilityScrollAreaRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityScrollAreaRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityScrollBarRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityScrollBarRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityScrollBarRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityScrollBarRole_FUNC);
-	rc = (jintLong)NSAccessibilityScrollBarRole;
+	rc = (jlong)NSAccessibilityScrollBarRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityScrollBarRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySelectedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySelectedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySelectedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySelectedAttribute_FUNC);
-	rc = (jintLong)NSAccessibilitySelectedAttribute;
+	rc = (jlong)NSAccessibilitySelectedAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySelectedAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySelectedChildrenAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySelectedChildrenAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySelectedChildrenAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySelectedChildrenAttribute_FUNC);
-	rc = (jintLong)NSAccessibilitySelectedChildrenAttribute;
+	rc = (jlong)NSAccessibilitySelectedChildrenAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySelectedChildrenAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySelectedChildrenChangedNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySelectedChildrenChangedNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySelectedChildrenChangedNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySelectedChildrenChangedNotification_FUNC);
-	rc = (jintLong)NSAccessibilitySelectedChildrenChangedNotification;
+	rc = (jlong)NSAccessibilitySelectedChildrenChangedNotification;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySelectedChildrenChangedNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySelectedColumnsAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySelectedColumnsAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySelectedColumnsAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySelectedColumnsAttribute_FUNC);
-	rc = (jintLong)NSAccessibilitySelectedColumnsAttribute;
+	rc = (jlong)NSAccessibilitySelectedColumnsAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySelectedColumnsAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySelectedRowsAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySelectedRowsAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySelectedRowsAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySelectedRowsAttribute_FUNC);
-	rc = (jintLong)NSAccessibilitySelectedRowsAttribute;
+	rc = (jlong)NSAccessibilitySelectedRowsAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySelectedRowsAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySelectedRowsChangedNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySelectedRowsChangedNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySelectedRowsChangedNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySelectedRowsChangedNotification_FUNC);
-	rc = (jintLong)NSAccessibilitySelectedRowsChangedNotification;
+	rc = (jlong)NSAccessibilitySelectedRowsChangedNotification;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySelectedRowsChangedNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySelectedTextAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySelectedTextAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySelectedTextAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySelectedTextAttribute_FUNC);
-	rc = (jintLong)NSAccessibilitySelectedTextAttribute;
+	rc = (jlong)NSAccessibilitySelectedTextAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySelectedTextAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySelectedTextChangedNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySelectedTextChangedNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySelectedTextChangedNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySelectedTextChangedNotification_FUNC);
-	rc = (jintLong)NSAccessibilitySelectedTextChangedNotification;
+	rc = (jlong)NSAccessibilitySelectedTextChangedNotification;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySelectedTextChangedNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySelectedTextRangeAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySelectedTextRangeAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySelectedTextRangeAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySelectedTextRangeAttribute_FUNC);
-	rc = (jintLong)NSAccessibilitySelectedTextRangeAttribute;
+	rc = (jlong)NSAccessibilitySelectedTextRangeAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySelectedTextRangeAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySelectedTextRangesAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySelectedTextRangesAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySelectedTextRangesAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySelectedTextRangesAttribute_FUNC);
-	rc = (jintLong)NSAccessibilitySelectedTextRangesAttribute;
+	rc = (jlong)NSAccessibilitySelectedTextRangesAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySelectedTextRangesAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityServesAsTitleForUIElementsAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityServesAsTitleForUIElementsAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityServesAsTitleForUIElementsAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityServesAsTitleForUIElementsAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityServesAsTitleForUIElementsAttribute;
+	rc = (jlong)NSAccessibilityServesAsTitleForUIElementsAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityServesAsTitleForUIElementsAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityShowMenuAction
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityShowMenuAction)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityShowMenuAction)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityShowMenuAction_FUNC);
-	rc = (jintLong)NSAccessibilityShowMenuAction;
+	rc = (jlong)NSAccessibilityShowMenuAction;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityShowMenuAction_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySizeAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySizeAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySizeAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySizeAttribute_FUNC);
-	rc = (jintLong)NSAccessibilitySizeAttribute;
+	rc = (jlong)NSAccessibilitySizeAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySizeAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySliderRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySliderRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySliderRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySliderRole_FUNC);
-	rc = (jintLong)NSAccessibilitySliderRole;
+	rc = (jlong)NSAccessibilitySliderRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySliderRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySortButtonRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySortButtonRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySortButtonRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySortButtonRole_FUNC);
-	rc = (jintLong)NSAccessibilitySortButtonRole;
+	rc = (jlong)NSAccessibilitySortButtonRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySortButtonRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySplitterRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySplitterRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySplitterRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySplitterRole_FUNC);
-	rc = (jintLong)NSAccessibilitySplitterRole;
+	rc = (jlong)NSAccessibilitySplitterRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySplitterRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityStandardWindowSubrole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityStandardWindowSubrole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityStandardWindowSubrole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityStandardWindowSubrole_FUNC);
-	rc = (jintLong)NSAccessibilityStandardWindowSubrole;
+	rc = (jlong)NSAccessibilityStandardWindowSubrole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityStandardWindowSubrole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityStaticTextRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityStaticTextRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityStaticTextRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityStaticTextRole_FUNC);
-	rc = (jintLong)NSAccessibilityStaticTextRole;
+	rc = (jlong)NSAccessibilityStaticTextRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityStaticTextRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityStrikethroughColorTextAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityStrikethroughColorTextAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityStrikethroughColorTextAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityStrikethroughColorTextAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityStrikethroughColorTextAttribute;
+	rc = (jlong)NSAccessibilityStrikethroughColorTextAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityStrikethroughColorTextAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityStrikethroughTextAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityStrikethroughTextAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityStrikethroughTextAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityStrikethroughTextAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityStrikethroughTextAttribute;
+	rc = (jlong)NSAccessibilityStrikethroughTextAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityStrikethroughTextAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityStringForRangeParameterizedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityStringForRangeParameterizedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityStringForRangeParameterizedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityStringForRangeParameterizedAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityStringForRangeParameterizedAttribute;
+	rc = (jlong)NSAccessibilityStringForRangeParameterizedAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityStringForRangeParameterizedAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityStyleRangeForIndexParameterizedAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityStyleRangeForIndexParameterizedAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityStyleRangeForIndexParameterizedAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityStyleRangeForIndexParameterizedAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityStyleRangeForIndexParameterizedAttribute;
+	rc = (jlong)NSAccessibilityStyleRangeForIndexParameterizedAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityStyleRangeForIndexParameterizedAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySubroleAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySubroleAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySubroleAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySubroleAttribute_FUNC);
-	rc = (jintLong)NSAccessibilitySubroleAttribute;
+	rc = (jlong)NSAccessibilitySubroleAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySubroleAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySuperscriptTextAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySuperscriptTextAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySuperscriptTextAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySuperscriptTextAttribute_FUNC);
-	rc = (jintLong)NSAccessibilitySuperscriptTextAttribute;
+	rc = (jlong)NSAccessibilitySuperscriptTextAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySuperscriptTextAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilitySystemDialogSubrole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilitySystemDialogSubrole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilitySystemDialogSubrole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilitySystemDialogSubrole_FUNC);
-	rc = (jintLong)NSAccessibilitySystemDialogSubrole;
+	rc = (jlong)NSAccessibilitySystemDialogSubrole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilitySystemDialogSubrole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityTabGroupRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityTabGroupRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityTabGroupRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityTabGroupRole_FUNC);
-	rc = (jintLong)NSAccessibilityTabGroupRole;
+	rc = (jlong)NSAccessibilityTabGroupRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityTabGroupRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityTableRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityTableRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityTableRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityTableRole_FUNC);
-	rc = (jintLong)NSAccessibilityTableRole;
+	rc = (jlong)NSAccessibilityTableRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityTableRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityTableRowSubrole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityTableRowSubrole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityTableRowSubrole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityTableRowSubrole_FUNC);
-	rc = (jintLong)NSAccessibilityTableRowSubrole;
+	rc = (jlong)NSAccessibilityTableRowSubrole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityTableRowSubrole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityTabsAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityTabsAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityTabsAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityTabsAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityTabsAttribute;
+	rc = (jlong)NSAccessibilityTabsAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityTabsAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityTextAreaRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityTextAreaRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityTextAreaRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityTextAreaRole_FUNC);
-	rc = (jintLong)NSAccessibilityTextAreaRole;
+	rc = (jlong)NSAccessibilityTextAreaRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityTextAreaRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityTextFieldRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityTextFieldRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityTextFieldRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityTextFieldRole_FUNC);
-	rc = (jintLong)NSAccessibilityTextFieldRole;
+	rc = (jlong)NSAccessibilityTextFieldRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityTextFieldRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityTextLinkSubrole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityTextLinkSubrole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityTextLinkSubrole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityTextLinkSubrole_FUNC);
-	rc = (jintLong)NSAccessibilityTextLinkSubrole;
+	rc = (jlong)NSAccessibilityTextLinkSubrole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityTextLinkSubrole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityTitleAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityTitleAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityTitleAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityTitleAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityTitleAttribute;
+	rc = (jlong)NSAccessibilityTitleAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityTitleAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityTitleChangedNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityTitleChangedNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityTitleChangedNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityTitleChangedNotification_FUNC);
-	rc = (jintLong)NSAccessibilityTitleChangedNotification;
+	rc = (jlong)NSAccessibilityTitleChangedNotification;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityTitleChangedNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityTitleUIElementAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityTitleUIElementAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityTitleUIElementAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityTitleUIElementAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityTitleUIElementAttribute;
+	rc = (jlong)NSAccessibilityTitleUIElementAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityTitleUIElementAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityToolbarRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityToolbarRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityToolbarRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityToolbarRole_FUNC);
-	rc = (jintLong)NSAccessibilityToolbarRole;
+	rc = (jlong)NSAccessibilityToolbarRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityToolbarRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityTopLevelUIElementAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityTopLevelUIElementAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityTopLevelUIElementAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityTopLevelUIElementAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityTopLevelUIElementAttribute;
+	rc = (jlong)NSAccessibilityTopLevelUIElementAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityTopLevelUIElementAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityURLAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityURLAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityURLAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityURLAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityURLAttribute;
+	rc = (jlong)NSAccessibilityURLAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityURLAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityUnderlineColorTextAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityUnderlineColorTextAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityUnderlineColorTextAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityUnderlineColorTextAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityUnderlineColorTextAttribute;
+	rc = (jlong)NSAccessibilityUnderlineColorTextAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityUnderlineColorTextAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityUnderlineTextAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityUnderlineTextAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityUnderlineTextAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityUnderlineTextAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityUnderlineTextAttribute;
+	rc = (jlong)NSAccessibilityUnderlineTextAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityUnderlineTextAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityUnignoredAncestor
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityUnignoredAncestor)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityUnignoredAncestor)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityUnignoredAncestor_FUNC);
-	rc = (jintLong)NSAccessibilityUnignoredAncestor((id)arg0);
+	rc = (jlong)NSAccessibilityUnignoredAncestor((id)arg0);
 	OS_NATIVE_EXIT(env, that, NSAccessibilityUnignoredAncestor_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityUnignoredChildren
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityUnignoredChildren)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityUnignoredChildren)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityUnignoredChildren_FUNC);
-	rc = (jintLong)NSAccessibilityUnignoredChildren((NSArray*)arg0);
+	rc = (jlong)NSAccessibilityUnignoredChildren((NSArray*)arg0);
 	OS_NATIVE_EXIT(env, that, NSAccessibilityUnignoredChildren_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityUnignoredChildrenForOnlyChild
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityUnignoredChildrenForOnlyChild)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityUnignoredChildrenForOnlyChild)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityUnignoredChildrenForOnlyChild_FUNC);
-	rc = (jintLong)NSAccessibilityUnignoredChildrenForOnlyChild((id)arg0);
+	rc = (jlong)NSAccessibilityUnignoredChildrenForOnlyChild((id)arg0);
 	OS_NATIVE_EXIT(env, that, NSAccessibilityUnignoredChildrenForOnlyChild_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityUnignoredDescendant
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityUnignoredDescendant)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityUnignoredDescendant)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityUnignoredDescendant_FUNC);
-	rc = (jintLong)NSAccessibilityUnignoredDescendant((id)arg0);
+	rc = (jlong)NSAccessibilityUnignoredDescendant((id)arg0);
 	OS_NATIVE_EXIT(env, that, NSAccessibilityUnignoredDescendant_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityUnknownRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityUnknownRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityUnknownRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityUnknownRole_FUNC);
-	rc = (jintLong)NSAccessibilityUnknownRole;
+	rc = (jlong)NSAccessibilityUnknownRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityUnknownRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityUnknownSubrole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityUnknownSubrole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityUnknownSubrole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityUnknownSubrole_FUNC);
-	rc = (jintLong)NSAccessibilityUnknownSubrole;
+	rc = (jlong)NSAccessibilityUnknownSubrole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityUnknownSubrole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityValueAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityValueAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityValueAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityValueAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityValueAttribute;
+	rc = (jlong)NSAccessibilityValueAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityValueAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityValueChangedNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityValueChangedNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityValueChangedNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityValueChangedNotification_FUNC);
-	rc = (jintLong)NSAccessibilityValueChangedNotification;
+	rc = (jlong)NSAccessibilityValueChangedNotification;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityValueChangedNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityValueDescriptionAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityValueDescriptionAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityValueDescriptionAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityValueDescriptionAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityValueDescriptionAttribute;
+	rc = (jlong)NSAccessibilityValueDescriptionAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityValueDescriptionAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityValueIndicatorRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityValueIndicatorRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityValueIndicatorRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityValueIndicatorRole_FUNC);
-	rc = (jintLong)NSAccessibilityValueIndicatorRole;
+	rc = (jlong)NSAccessibilityValueIndicatorRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityValueIndicatorRole_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityVerticalOrientationValue
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityVerticalOrientationValue)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityVerticalOrientationValue)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityVerticalOrientationValue_FUNC);
-	rc = (jintLong)NSAccessibilityVerticalOrientationValue;
+	rc = (jlong)NSAccessibilityVerticalOrientationValue;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityVerticalOrientationValue_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityVerticalScrollBarAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityVerticalScrollBarAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityVerticalScrollBarAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityVerticalScrollBarAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityVerticalScrollBarAttribute;
+	rc = (jlong)NSAccessibilityVerticalScrollBarAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityVerticalScrollBarAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityVisibleCharacterRangeAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityVisibleCharacterRangeAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityVisibleCharacterRangeAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityVisibleCharacterRangeAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityVisibleCharacterRangeAttribute;
+	rc = (jlong)NSAccessibilityVisibleCharacterRangeAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityVisibleCharacterRangeAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityVisibleChildrenAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityVisibleChildrenAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityVisibleChildrenAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityVisibleChildrenAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityVisibleChildrenAttribute;
+	rc = (jlong)NSAccessibilityVisibleChildrenAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityVisibleChildrenAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityVisibleColumnsAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityVisibleColumnsAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityVisibleColumnsAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityVisibleColumnsAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityVisibleColumnsAttribute;
+	rc = (jlong)NSAccessibilityVisibleColumnsAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityVisibleColumnsAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityVisibleNameKey
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityVisibleNameKey)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityVisibleNameKey)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityVisibleNameKey_FUNC);
-	rc = (jintLong)NSAccessibilityVisibleNameKey;
+	rc = (jlong)NSAccessibilityVisibleNameKey;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityVisibleNameKey_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityVisibleRowsAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityVisibleRowsAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityVisibleRowsAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityVisibleRowsAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityVisibleRowsAttribute;
+	rc = (jlong)NSAccessibilityVisibleRowsAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityVisibleRowsAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityWindowAttribute
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityWindowAttribute)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityWindowAttribute)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityWindowAttribute_FUNC);
-	rc = (jintLong)NSAccessibilityWindowAttribute;
+	rc = (jlong)NSAccessibilityWindowAttribute;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityWindowAttribute_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAccessibilityWindowRole
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAccessibilityWindowRole)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAccessibilityWindowRole)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAccessibilityWindowRole_FUNC);
-	rc = (jintLong)NSAccessibilityWindowRole;
+	rc = (jlong)NSAccessibilityWindowRole;
 	OS_NATIVE_EXIT(env, that, NSAccessibilityWindowRole_FUNC);
 	return rc;
 }
@@ -4532,48 +4532,48 @@ JNIEXPORT jint JNICALL OS_NATIVE(NSAffineTransformStruct_1sizeof)
 #endif
 
 #ifndef NO_NSApplicationDidChangeScreenParametersNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSApplicationDidChangeScreenParametersNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSApplicationDidChangeScreenParametersNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSApplicationDidChangeScreenParametersNotification_FUNC);
-	rc = (jintLong)NSApplicationDidChangeScreenParametersNotification;
+	rc = (jlong)NSApplicationDidChangeScreenParametersNotification;
 	OS_NATIVE_EXIT(env, that, NSApplicationDidChangeScreenParametersNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSAttachmentAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSAttachmentAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSAttachmentAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSAttachmentAttributeName_FUNC);
-	rc = (jintLong)NSAttachmentAttributeName;
+	rc = (jlong)NSAttachmentAttributeName;
 	OS_NATIVE_EXIT(env, that, NSAttachmentAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSBackgroundColorAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSBackgroundColorAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSBackgroundColorAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSBackgroundColorAttributeName_FUNC);
-	rc = (jintLong)NSBackgroundColorAttributeName;
+	rc = (jlong)NSBackgroundColorAttributeName;
 	OS_NATIVE_EXIT(env, that, NSBackgroundColorAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSBaselineOffsetAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSBaselineOffsetAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSBaselineOffsetAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSBaselineOffsetAttributeName_FUNC);
-	rc = (jintLong)NSBaselineOffsetAttributeName;
+	rc = (jlong)NSBaselineOffsetAttributeName;
 	OS_NATIVE_EXIT(env, that, NSBaselineOffsetAttributeName_FUNC);
 	return rc;
 }
@@ -4590,24 +4590,24 @@ JNIEXPORT void JNICALL OS_NATIVE(NSBeep)
 #endif
 
 #ifndef NO_NSBitsPerPixelFromDepth
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSBitsPerPixelFromDepth)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSBitsPerPixelFromDepth)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSBitsPerPixelFromDepth_FUNC);
-	rc = (jintLong)NSBitsPerPixelFromDepth((NSWindowDepth)arg0);
+	rc = (jlong)NSBitsPerPixelFromDepth((NSWindowDepth)arg0);
 	OS_NATIVE_EXIT(env, that, NSBitsPerPixelFromDepth_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSCalibratedRGBColorSpace
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSCalibratedRGBColorSpace)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSCalibratedRGBColorSpace)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSCalibratedRGBColorSpace_FUNC);
-	rc = (jintLong)NSCalibratedRGBColorSpace;
+	rc = (jlong)NSCalibratedRGBColorSpace;
 	OS_NATIVE_EXIT(env, that, NSCalibratedRGBColorSpace_FUNC);
 	return rc;
 }
@@ -4615,73 +4615,73 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NSCalibratedRGBColorSpace)
 
 #ifndef NO_NSCountWindows
 JNIEXPORT void JNICALL OS_NATIVE(NSCountWindows)
-	(JNIEnv *env, jclass that, jintLongArray arg0)
+	(JNIEnv *env, jclass that, jlongArray arg0)
 {
-	jintLong *lparg0=NULL;
+	jlong *lparg0=NULL;
 	OS_NATIVE_ENTER(env, that, NSCountWindows_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;
 	NSCountWindows((NSInteger*)lparg0);
 fail:
-	if (arg0 && lparg0) (*env)->ReleaseIntLongArrayElements(env, arg0, lparg0, 0);
+	if (arg0 && lparg0) (*env)->ReleaseLongArrayElements(env, arg0, lparg0, 0);
 	OS_NATIVE_EXIT(env, that, NSCountWindows_FUNC);
 }
 #endif
 
 #ifndef NO_NSCursorAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSCursorAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSCursorAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSCursorAttributeName_FUNC);
-	rc = (jintLong)NSCursorAttributeName;
+	rc = (jlong)NSCursorAttributeName;
 	OS_NATIVE_EXIT(env, that, NSCursorAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSDefaultRunLoopMode
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSDefaultRunLoopMode)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSDefaultRunLoopMode)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSDefaultRunLoopMode_FUNC);
-	rc = (jintLong)NSDefaultRunLoopMode;
+	rc = (jlong)NSDefaultRunLoopMode;
 	OS_NATIVE_EXIT(env, that, NSDefaultRunLoopMode_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSDeviceRGBColorSpace
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSDeviceRGBColorSpace)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSDeviceRGBColorSpace)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSDeviceRGBColorSpace_FUNC);
-	rc = (jintLong)NSDeviceRGBColorSpace;
+	rc = (jlong)NSDeviceRGBColorSpace;
 	OS_NATIVE_EXIT(env, that, NSDeviceRGBColorSpace_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSDeviceResolution
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSDeviceResolution)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSDeviceResolution)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSDeviceResolution_FUNC);
-	rc = (jintLong)NSDeviceResolution;
+	rc = (jlong)NSDeviceResolution;
 	OS_NATIVE_EXIT(env, that, NSDeviceResolution_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSDragPboard
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSDragPboard)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSDragPboard)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSDragPboard_FUNC);
-	rc = (jintLong)NSDragPboard;
+	rc = (jlong)NSDragPboard;
 	OS_NATIVE_EXIT(env, that, NSDragPboard_FUNC);
 	return rc;
 }
@@ -4707,235 +4707,235 @@ fail:
 #endif
 
 #ifndef NO_NSErrorFailingURLStringKey
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSErrorFailingURLStringKey)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSErrorFailingURLStringKey)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSErrorFailingURLStringKey_FUNC);
-	rc = (jintLong)NSErrorFailingURLStringKey;
+	rc = (jlong)NSErrorFailingURLStringKey;
 	OS_NATIVE_EXIT(env, that, NSErrorFailingURLStringKey_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSEventTrackingRunLoopMode
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSEventTrackingRunLoopMode)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSEventTrackingRunLoopMode)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSEventTrackingRunLoopMode_FUNC);
-	rc = (jintLong)NSEventTrackingRunLoopMode;
+	rc = (jlong)NSEventTrackingRunLoopMode;
 	OS_NATIVE_EXIT(env, that, NSEventTrackingRunLoopMode_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSFileTypeForHFSTypeCode
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSFileTypeForHFSTypeCode)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSFileTypeForHFSTypeCode)
 	(JNIEnv *env, jclass that, jint arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSFileTypeForHFSTypeCode_FUNC);
-	rc = (jintLong)NSFileTypeForHFSTypeCode((OSType)arg0);
+	rc = (jlong)NSFileTypeForHFSTypeCode((OSType)arg0);
 	OS_NATIVE_EXIT(env, that, NSFileTypeForHFSTypeCode_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSFilenamesPboardType
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSFilenamesPboardType)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSFilenamesPboardType)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSFilenamesPboardType_FUNC);
-	rc = (jintLong)NSFilenamesPboardType;
+	rc = (jlong)NSFilenamesPboardType;
 	OS_NATIVE_EXIT(env, that, NSFilenamesPboardType_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSFontAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSFontAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSFontAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSFontAttributeName_FUNC);
-	rc = (jintLong)NSFontAttributeName;
+	rc = (jlong)NSFontAttributeName;
 	OS_NATIVE_EXIT(env, that, NSFontAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSForegroundColorAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSForegroundColorAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSForegroundColorAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSForegroundColorAttributeName_FUNC);
-	rc = (jintLong)NSForegroundColorAttributeName;
+	rc = (jlong)NSForegroundColorAttributeName;
 	OS_NATIVE_EXIT(env, that, NSForegroundColorAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSGetSizeAndAlignment
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSGetSizeAndAlignment)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1, jintLongArray arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSGetSizeAndAlignment)
+	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1, jlongArray arg2)
 {
-	jintLong *lparg1=NULL;
-	jintLong *lparg2=NULL;
-	jintLong rc = 0;
+	jlong *lparg1=NULL;
+	jlong *lparg2=NULL;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSGetSizeAndAlignment_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;
-	rc = (jintLong)NSGetSizeAndAlignment((char*)arg0, (NSUInteger*)lparg1, (NSUInteger*)lparg2);
+	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)NSGetSizeAndAlignment((char*)arg0, (NSUInteger*)lparg1, (NSUInteger*)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, NSGetSizeAndAlignment_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSLigatureAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSLigatureAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSLigatureAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSLigatureAttributeName_FUNC);
-	rc = (jintLong)NSLigatureAttributeName;
+	rc = (jlong)NSLigatureAttributeName;
 	OS_NATIVE_EXIT(env, that, NSLigatureAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSLinkAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSLinkAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSLinkAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSLinkAttributeName_FUNC);
-	rc = (jintLong)NSLinkAttributeName;
+	rc = (jlong)NSLinkAttributeName;
 	OS_NATIVE_EXIT(env, that, NSLinkAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSLocaleLanguageCode
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSLocaleLanguageCode)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSLocaleLanguageCode)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSLocaleLanguageCode_FUNC);
-	rc = (jintLong)NSLocaleLanguageCode;
+	rc = (jlong)NSLocaleLanguageCode;
 	OS_NATIVE_EXIT(env, that, NSLocaleLanguageCode_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSModalPanelRunLoopMode
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSModalPanelRunLoopMode)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSModalPanelRunLoopMode)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSModalPanelRunLoopMode_FUNC);
-	rc = (jintLong)NSModalPanelRunLoopMode;
+	rc = (jlong)NSModalPanelRunLoopMode;
 	OS_NATIVE_EXIT(env, that, NSModalPanelRunLoopMode_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSNotFound
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSNotFound)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSNotFound)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSNotFound_FUNC);
-	rc = (jintLong)NSNotFound;
+	rc = (jlong)NSNotFound;
 	OS_NATIVE_EXIT(env, that, NSNotFound_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSNumberOfColorComponents
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSNumberOfColorComponents)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSNumberOfColorComponents)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSNumberOfColorComponents_FUNC);
-	rc = (jintLong)NSNumberOfColorComponents((NSString*)arg0);
+	rc = (jlong)NSNumberOfColorComponents((NSString*)arg0);
 	OS_NATIVE_EXIT(env, that, NSNumberOfColorComponents_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSObliquenessAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSObliquenessAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSObliquenessAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSObliquenessAttributeName_FUNC);
-	rc = (jintLong)NSObliquenessAttributeName;
+	rc = (jlong)NSObliquenessAttributeName;
 	OS_NATIVE_EXIT(env, that, NSObliquenessAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSOutlineViewColumnDidMoveNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSOutlineViewColumnDidMoveNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSOutlineViewColumnDidMoveNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSOutlineViewColumnDidMoveNotification_FUNC);
-	rc = (jintLong)NSOutlineViewColumnDidMoveNotification;
+	rc = (jlong)NSOutlineViewColumnDidMoveNotification;
 	OS_NATIVE_EXIT(env, that, NSOutlineViewColumnDidMoveNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSParagraphStyleAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSParagraphStyleAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSParagraphStyleAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSParagraphStyleAttributeName_FUNC);
-	rc = (jintLong)NSParagraphStyleAttributeName;
+	rc = (jlong)NSParagraphStyleAttributeName;
 	OS_NATIVE_EXIT(env, that, NSParagraphStyleAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPasteboardTypeHTML
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPasteboardTypeHTML)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPasteboardTypeHTML)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPasteboardTypeHTML_FUNC);
-	rc = (jintLong)NSPasteboardTypeHTML;
+	rc = (jlong)NSPasteboardTypeHTML;
 	OS_NATIVE_EXIT(env, that, NSPasteboardTypeHTML_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPasteboardTypeRTF
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPasteboardTypeRTF)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPasteboardTypeRTF)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPasteboardTypeRTF_FUNC);
-	rc = (jintLong)NSPasteboardTypeRTF;
+	rc = (jlong)NSPasteboardTypeRTF;
 	OS_NATIVE_EXIT(env, that, NSPasteboardTypeRTF_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPasteboardTypeString
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPasteboardTypeString)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPasteboardTypeString)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPasteboardTypeString_FUNC);
-	rc = (jintLong)NSPasteboardTypeString;
+	rc = (jlong)NSPasteboardTypeString;
 	OS_NATIVE_EXIT(env, that, NSPasteboardTypeString_FUNC);
 	return rc;
 }
@@ -4973,144 +4973,144 @@ JNIEXPORT jint JNICALL OS_NATIVE(NSPoint_1sizeof)
 #endif
 
 #ifndef NO_NSPrintAllPages
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintAllPages)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPrintAllPages)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintAllPages_FUNC);
-	rc = (jintLong)NSPrintAllPages;
+	rc = (jlong)NSPrintAllPages;
 	OS_NATIVE_EXIT(env, that, NSPrintAllPages_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintCopies
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintCopies)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPrintCopies)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintCopies_FUNC);
-	rc = (jintLong)NSPrintCopies;
+	rc = (jlong)NSPrintCopies;
 	OS_NATIVE_EXIT(env, that, NSPrintCopies_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintFirstPage
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintFirstPage)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPrintFirstPage)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintFirstPage_FUNC);
-	rc = (jintLong)NSPrintFirstPage;
+	rc = (jlong)NSPrintFirstPage;
 	OS_NATIVE_EXIT(env, that, NSPrintFirstPage_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintJobDisposition
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintJobDisposition)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPrintJobDisposition)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintJobDisposition_FUNC);
-	rc = (jintLong)NSPrintJobDisposition;
+	rc = (jlong)NSPrintJobDisposition;
 	OS_NATIVE_EXIT(env, that, NSPrintJobDisposition_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintLastPage
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintLastPage)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPrintLastPage)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintLastPage_FUNC);
-	rc = (jintLong)NSPrintLastPage;
+	rc = (jlong)NSPrintLastPage;
 	OS_NATIVE_EXIT(env, that, NSPrintLastPage_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintMustCollate
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintMustCollate)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPrintMustCollate)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintMustCollate_FUNC);
-	rc = (jintLong)NSPrintMustCollate;
+	rc = (jlong)NSPrintMustCollate;
 	OS_NATIVE_EXIT(env, that, NSPrintMustCollate_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintOrientation
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintOrientation)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPrintOrientation)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintOrientation_FUNC);
-	rc = (jintLong)NSPrintOrientation;
+	rc = (jlong)NSPrintOrientation;
 	OS_NATIVE_EXIT(env, that, NSPrintOrientation_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintPreviewJob
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintPreviewJob)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPrintPreviewJob)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintPreviewJob_FUNC);
-	rc = (jintLong)NSPrintPreviewJob;
+	rc = (jlong)NSPrintPreviewJob;
 	OS_NATIVE_EXIT(env, that, NSPrintPreviewJob_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintSaveJob
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintSaveJob)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPrintSaveJob)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintSaveJob_FUNC);
-	rc = (jintLong)NSPrintSaveJob;
+	rc = (jlong)NSPrintSaveJob;
 	OS_NATIVE_EXIT(env, that, NSPrintSaveJob_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintSavePath
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintSavePath)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPrintSavePath)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintSavePath_FUNC);
-	rc = (jintLong)NSPrintSavePath;
+	rc = (jlong)NSPrintSavePath;
 	OS_NATIVE_EXIT(env, that, NSPrintSavePath_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintScalingFactor
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintScalingFactor)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPrintScalingFactor)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintScalingFactor_FUNC);
-	rc = (jintLong)NSPrintScalingFactor;
+	rc = (jlong)NSPrintScalingFactor;
 	OS_NATIVE_EXIT(env, that, NSPrintScalingFactor_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSPrintSpoolJob
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSPrintSpoolJob)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSPrintSpoolJob)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSPrintSpoolJob_FUNC);
-	rc = (jintLong)NSPrintSpoolJob;
+	rc = (jlong)NSPrintSpoolJob;
 	OS_NATIVE_EXIT(env, that, NSPrintSpoolJob_FUNC);
 	return rc;
 }
@@ -5130,7 +5130,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(NSRange_1sizeof)
 
 #ifndef NO_NSRectFillUsingOperation
 JNIEXPORT void JNICALL OS_NATIVE(NSRectFillUsingOperation)
-	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1)
 {
 	NSRect _arg0, *lparg0=NULL;
 	OS_NATIVE_ENTER(env, that, NSRectFillUsingOperation_FUNC);
@@ -5155,12 +5155,12 @@ JNIEXPORT jint JNICALL OS_NATIVE(NSRect_1sizeof)
 #endif
 
 #ifndef NO_NSSearchPathForDirectoriesInDomains
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSSearchPathForDirectoriesInDomains)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSSearchPathForDirectoriesInDomains)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSSearchPathForDirectoriesInDomains_FUNC);
-	rc = (jintLong)NSSearchPathForDirectoriesInDomains((NSSearchPathDirectory)arg0, (NSSearchPathDomainMask)arg1, (BOOL)arg2);
+	rc = (jlong)NSSearchPathForDirectoriesInDomains((NSSearchPathDirectory)arg0, (NSSearchPathDomainMask)arg1, (BOOL)arg2);
 	OS_NATIVE_EXIT(env, that, NSSearchPathForDirectoriesInDomains_FUNC);
 	return rc;
 }
@@ -5179,378 +5179,378 @@ JNIEXPORT jint JNICALL OS_NATIVE(NSSize_1sizeof)
 #endif
 
 #ifndef NO_NSSpellingStateAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSSpellingStateAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSSpellingStateAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSSpellingStateAttributeName_FUNC);
-	rc = (jintLong)NSSpellingStateAttributeName;
+	rc = (jlong)NSSpellingStateAttributeName;
 	OS_NATIVE_EXIT(env, that, NSSpellingStateAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSSquareStatusItemLength
-JNIEXPORT jfloatDouble JNICALL OS_NATIVE(NSSquareStatusItemLength)
+JNIEXPORT jdouble JNICALL OS_NATIVE(NSSquareStatusItemLength)
 	(JNIEnv *env, jclass that)
 {
-	jfloatDouble rc = 0;
+	jdouble rc = 0;
 	OS_NATIVE_ENTER(env, that, NSSquareStatusItemLength_FUNC);
-	rc = (jfloatDouble)NSSquareStatusItemLength;
+	rc = (jdouble)NSSquareStatusItemLength;
 	OS_NATIVE_EXIT(env, that, NSSquareStatusItemLength_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSStrikethroughColorAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSStrikethroughColorAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSStrikethroughColorAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSStrikethroughColorAttributeName_FUNC);
-	rc = (jintLong)NSStrikethroughColorAttributeName;
+	rc = (jlong)NSStrikethroughColorAttributeName;
 	OS_NATIVE_EXIT(env, that, NSStrikethroughColorAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSStrikethroughStyleAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSStrikethroughStyleAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSStrikethroughStyleAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSStrikethroughStyleAttributeName_FUNC);
-	rc = (jintLong)NSStrikethroughStyleAttributeName;
+	rc = (jlong)NSStrikethroughStyleAttributeName;
 	OS_NATIVE_EXIT(env, that, NSStrikethroughStyleAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSStrokeWidthAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSStrokeWidthAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSStrokeWidthAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSStrokeWidthAttributeName_FUNC);
-	rc = (jintLong)NSStrokeWidthAttributeName;
+	rc = (jlong)NSStrokeWidthAttributeName;
 	OS_NATIVE_EXIT(env, that, NSStrokeWidthAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSSystemColorsDidChangeNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSSystemColorsDidChangeNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSSystemColorsDidChangeNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSSystemColorsDidChangeNotification_FUNC);
-	rc = (jintLong)NSSystemColorsDidChangeNotification;
+	rc = (jlong)NSSystemColorsDidChangeNotification;
 	OS_NATIVE_EXIT(env, that, NSSystemColorsDidChangeNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSTIFFPboardType
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSTIFFPboardType)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSTIFFPboardType)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSTIFFPboardType_FUNC);
-	rc = (jintLong)NSTIFFPboardType;
+	rc = (jlong)NSTIFFPboardType;
 	OS_NATIVE_EXIT(env, that, NSTIFFPboardType_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSTableViewColumnDidMoveNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSTableViewColumnDidMoveNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSTableViewColumnDidMoveNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSTableViewColumnDidMoveNotification_FUNC);
-	rc = (jintLong)NSTableViewColumnDidMoveNotification;
+	rc = (jlong)NSTableViewColumnDidMoveNotification;
 	OS_NATIVE_EXIT(env, that, NSTableViewColumnDidMoveNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSTemporaryDirectory
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSTemporaryDirectory)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSTemporaryDirectory)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSTemporaryDirectory_FUNC);
-	rc = (jintLong)NSTemporaryDirectory();
+	rc = (jlong)NSTemporaryDirectory();
 	OS_NATIVE_EXIT(env, that, NSTemporaryDirectory_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSToolbarCustomizeToolbarItemIdentifier
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSToolbarCustomizeToolbarItemIdentifier)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSToolbarCustomizeToolbarItemIdentifier)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSToolbarCustomizeToolbarItemIdentifier_FUNC);
-	rc = (jintLong)NSToolbarCustomizeToolbarItemIdentifier;
+	rc = (jlong)NSToolbarCustomizeToolbarItemIdentifier;
 	OS_NATIVE_EXIT(env, that, NSToolbarCustomizeToolbarItemIdentifier_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSToolbarDidRemoveItemNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSToolbarDidRemoveItemNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSToolbarDidRemoveItemNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSToolbarDidRemoveItemNotification_FUNC);
-	rc = (jintLong)NSToolbarDidRemoveItemNotification;
+	rc = (jlong)NSToolbarDidRemoveItemNotification;
 	OS_NATIVE_EXIT(env, that, NSToolbarDidRemoveItemNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSToolbarFlexibleSpaceItemIdentifier
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSToolbarFlexibleSpaceItemIdentifier)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSToolbarFlexibleSpaceItemIdentifier)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSToolbarFlexibleSpaceItemIdentifier_FUNC);
-	rc = (jintLong)NSToolbarFlexibleSpaceItemIdentifier;
+	rc = (jlong)NSToolbarFlexibleSpaceItemIdentifier;
 	OS_NATIVE_EXIT(env, that, NSToolbarFlexibleSpaceItemIdentifier_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSToolbarPrintItemIdentifier
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSToolbarPrintItemIdentifier)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSToolbarPrintItemIdentifier)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSToolbarPrintItemIdentifier_FUNC);
-	rc = (jintLong)NSToolbarPrintItemIdentifier;
+	rc = (jlong)NSToolbarPrintItemIdentifier;
 	OS_NATIVE_EXIT(env, that, NSToolbarPrintItemIdentifier_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSToolbarSeparatorItemIdentifier
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSToolbarSeparatorItemIdentifier)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSToolbarSeparatorItemIdentifier)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSToolbarSeparatorItemIdentifier_FUNC);
-	rc = (jintLong)NSToolbarSeparatorItemIdentifier;
+	rc = (jlong)NSToolbarSeparatorItemIdentifier;
 	OS_NATIVE_EXIT(env, that, NSToolbarSeparatorItemIdentifier_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSToolbarShowColorsItemIdentifier
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSToolbarShowColorsItemIdentifier)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSToolbarShowColorsItemIdentifier)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSToolbarShowColorsItemIdentifier_FUNC);
-	rc = (jintLong)NSToolbarShowColorsItemIdentifier;
+	rc = (jlong)NSToolbarShowColorsItemIdentifier;
 	OS_NATIVE_EXIT(env, that, NSToolbarShowColorsItemIdentifier_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSToolbarShowFontsItemIdentifier
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSToolbarShowFontsItemIdentifier)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSToolbarShowFontsItemIdentifier)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSToolbarShowFontsItemIdentifier_FUNC);
-	rc = (jintLong)NSToolbarShowFontsItemIdentifier;
+	rc = (jlong)NSToolbarShowFontsItemIdentifier;
 	OS_NATIVE_EXIT(env, that, NSToolbarShowFontsItemIdentifier_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSToolbarSpaceItemIdentifier
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSToolbarSpaceItemIdentifier)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSToolbarSpaceItemIdentifier)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSToolbarSpaceItemIdentifier_FUNC);
-	rc = (jintLong)NSToolbarSpaceItemIdentifier;
+	rc = (jlong)NSToolbarSpaceItemIdentifier;
 	OS_NATIVE_EXIT(env, that, NSToolbarSpaceItemIdentifier_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSToolbarWillAddItemNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSToolbarWillAddItemNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSToolbarWillAddItemNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSToolbarWillAddItemNotification_FUNC);
-	rc = (jintLong)NSToolbarWillAddItemNotification;
+	rc = (jlong)NSToolbarWillAddItemNotification;
 	OS_NATIVE_EXIT(env, that, NSToolbarWillAddItemNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSURLPboardType
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSURLPboardType)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSURLPboardType)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSURLPboardType_FUNC);
-	rc = (jintLong)NSURLPboardType;
+	rc = (jlong)NSURLPboardType;
 	OS_NATIVE_EXIT(env, that, NSURLPboardType_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSUnderlineColorAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSUnderlineColorAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSUnderlineColorAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSUnderlineColorAttributeName_FUNC);
-	rc = (jintLong)NSUnderlineColorAttributeName;
+	rc = (jlong)NSUnderlineColorAttributeName;
 	OS_NATIVE_EXIT(env, that, NSUnderlineColorAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSUnderlineStyleAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSUnderlineStyleAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSUnderlineStyleAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSUnderlineStyleAttributeName_FUNC);
-	rc = (jintLong)NSUnderlineStyleAttributeName;
+	rc = (jlong)NSUnderlineStyleAttributeName;
 	OS_NATIVE_EXIT(env, that, NSUnderlineStyleAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSViewGlobalFrameDidChangeNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSViewGlobalFrameDidChangeNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSViewGlobalFrameDidChangeNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSViewGlobalFrameDidChangeNotification_FUNC);
-	rc = (jintLong)NSViewGlobalFrameDidChangeNotification;
+	rc = (jlong)NSViewGlobalFrameDidChangeNotification;
 	OS_NATIVE_EXIT(env, that, NSViewGlobalFrameDidChangeNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSWindowDidBecomeKeyNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSWindowDidBecomeKeyNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSWindowDidBecomeKeyNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSWindowDidBecomeKeyNotification_FUNC);
-	rc = (jintLong)NSWindowDidBecomeKeyNotification;
+	rc = (jlong)NSWindowDidBecomeKeyNotification;
 	OS_NATIVE_EXIT(env, that, NSWindowDidBecomeKeyNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSWindowDidDeminiaturizeNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSWindowDidDeminiaturizeNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSWindowDidDeminiaturizeNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSWindowDidDeminiaturizeNotification_FUNC);
-	rc = (jintLong)NSWindowDidDeminiaturizeNotification;
+	rc = (jlong)NSWindowDidDeminiaturizeNotification;
 	OS_NATIVE_EXIT(env, that, NSWindowDidDeminiaturizeNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSWindowDidMiniaturizeNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSWindowDidMiniaturizeNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSWindowDidMiniaturizeNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSWindowDidMiniaturizeNotification_FUNC);
-	rc = (jintLong)NSWindowDidMiniaturizeNotification;
+	rc = (jlong)NSWindowDidMiniaturizeNotification;
 	OS_NATIVE_EXIT(env, that, NSWindowDidMiniaturizeNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSWindowDidMoveNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSWindowDidMoveNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSWindowDidMoveNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSWindowDidMoveNotification_FUNC);
-	rc = (jintLong)NSWindowDidMoveNotification;
+	rc = (jlong)NSWindowDidMoveNotification;
 	OS_NATIVE_EXIT(env, that, NSWindowDidMoveNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSWindowDidResignKeyNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSWindowDidResignKeyNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSWindowDidResignKeyNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSWindowDidResignKeyNotification_FUNC);
-	rc = (jintLong)NSWindowDidResignKeyNotification;
+	rc = (jlong)NSWindowDidResignKeyNotification;
 	OS_NATIVE_EXIT(env, that, NSWindowDidResignKeyNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSWindowDidResizeNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSWindowDidResizeNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSWindowDidResizeNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSWindowDidResizeNotification_FUNC);
-	rc = (jintLong)NSWindowDidResizeNotification;
+	rc = (jlong)NSWindowDidResizeNotification;
 	OS_NATIVE_EXIT(env, that, NSWindowDidResizeNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NSWindowWillCloseNotification
-JNIEXPORT jintLong JNICALL OS_NATIVE(NSWindowWillCloseNotification)
+JNIEXPORT jlong JNICALL OS_NATIVE(NSWindowWillCloseNotification)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NSWindowWillCloseNotification_FUNC);
-	rc = (jintLong)NSWindowWillCloseNotification;
+	rc = (jlong)NSWindowWillCloseNotification;
 	OS_NATIVE_EXIT(env, that, NSWindowWillCloseNotification_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NewGlobalRef
-JNIEXPORT jintLong JNICALL OS_NATIVE(NewGlobalRef)
+JNIEXPORT jlong JNICALL OS_NATIVE(NewGlobalRef)
 	(JNIEnv *env, jclass that, jobject arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NewGlobalRef_FUNC);
-	rc = (jintLong)(*env)->NewGlobalRef(env, arg0);
+	rc = (jlong)(*env)->NewGlobalRef(env, arg0);
 	OS_NATIVE_EXIT(env, that, NewGlobalRef_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_NewRgn
-JNIEXPORT jintLong JNICALL OS_NATIVE(NewRgn)
+JNIEXPORT jlong JNICALL OS_NATIVE(NewRgn)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, NewRgn_FUNC);
 /*
-	rc = (jintLong)NewRgn();
+	rc = (jlong)NewRgn();
 */
 	{
 		OS_LOAD_FUNCTION(fp, NewRgn)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
+			rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, NewRgn_FUNC);
@@ -5560,7 +5560,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NewRgn)
 
 #ifndef NO_OffsetRgn
 JNIEXPORT void JNICALL OS_NATIVE(OffsetRgn)
-	(JNIEnv *env, jclass that, jintLong arg0, jshort arg1, jshort arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jshort arg1, jshort arg2)
 {
 	OS_NATIVE_ENTER(env, that, OffsetRgn_FUNC);
 /*
@@ -5569,7 +5569,7 @@ JNIEXPORT void JNICALL OS_NATIVE(OffsetRgn)
 	{
 		OS_LOAD_FUNCTION(fp, OffsetRgn)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jshort, jshort))fp)(arg0, arg1, arg2);
+			((void (CALLING_CONVENTION*)(jlong, jshort, jshort))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, OffsetRgn_FUNC);
@@ -5595,20 +5595,20 @@ JNIEXPORT void JNICALL OS_NATIVE(OpenRgn)
 #endif
 
 #ifndef NO_PMGetDuplex
-JNIEXPORT jintLong JNICALL OS_NATIVE(PMGetDuplex)
-	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(PMGetDuplex)
+	(JNIEnv *env, jclass that, jlong arg0, jintArray arg1)
 {
 	jint *lparg1=NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, PMGetDuplex_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)PMGetDuplex((PMPrintSettings)arg0, (PMDuplexMode *)lparg1);
+	rc = (jlong)PMGetDuplex((PMPrintSettings)arg0, (PMDuplexMode *)lparg1);
 */
 	{
 		OS_LOAD_FUNCTION(fp, PMGetDuplex)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrintSettings, PMDuplexMode *))fp)((PMPrintSettings)arg0, (PMDuplexMode *)lparg1);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(PMPrintSettings, PMDuplexMode *))fp)((PMPrintSettings)arg0, (PMDuplexMode *)lparg1);
 		}
 	}
 fail:
@@ -5619,20 +5619,20 @@ fail:
 #endif
 
 #ifndef NO_PMPrinterGetIndexedPrinterResolution
-JNIEXPORT jintLong JNICALL OS_NATIVE(PMPrinterGetIndexedPrinterResolution)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(PMPrinterGetIndexedPrinterResolution)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jobject arg2)
 {
 	PMResolution _arg2, *lparg2=NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, PMPrinterGetIndexedPrinterResolution_FUNC);
 	if (arg2) if ((lparg2 = getPMResolutionFields(env, arg2, &_arg2)) == NULL) goto fail;
 /*
-	rc = (jintLong)PMPrinterGetIndexedPrinterResolution((PMPrinter)arg0, arg1, (PMResolution *)lparg2);
+	rc = (jlong)PMPrinterGetIndexedPrinterResolution((PMPrinter)arg0, arg1, (PMResolution *)lparg2);
 */
 	{
 		OS_LOAD_FUNCTION(fp, PMPrinterGetIndexedPrinterResolution)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrinter, jint, PMResolution *))fp)((PMPrinter)arg0, arg1, (PMResolution *)lparg2);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(PMPrinter, jint, PMResolution *))fp)((PMPrinter)arg0, arg1, (PMResolution *)lparg2);
 		}
 	}
 fail:
@@ -5643,20 +5643,20 @@ fail:
 #endif
 
 #ifndef NO_PMPrinterGetOutputResolution
-JNIEXPORT jintLong JNICALL OS_NATIVE(PMPrinterGetOutputResolution)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(PMPrinterGetOutputResolution)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2)
 {
 	PMResolution _arg2, *lparg2=NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, PMPrinterGetOutputResolution_FUNC);
 	if (arg2) if ((lparg2 = getPMResolutionFields(env, arg2, &_arg2)) == NULL) goto fail;
 /*
-	rc = (jintLong)PMPrinterGetOutputResolution((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2);
+	rc = (jlong)PMPrinterGetOutputResolution((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2);
 */
 	{
 		OS_LOAD_FUNCTION(fp, PMPrinterGetOutputResolution)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrinter, PMPrintSettings, PMResolution *))fp)((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(PMPrinter, PMPrintSettings, PMResolution *))fp)((PMPrinter)arg0, (PMPrintSettings)arg1, (PMResolution *)lparg2);
 		}
 	}
 fail:
@@ -5667,20 +5667,20 @@ fail:
 #endif
 
 #ifndef NO_PMPrinterGetPrinterResolutionCount
-JNIEXPORT jintLong JNICALL OS_NATIVE(PMPrinterGetPrinterResolutionCount)
-	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(PMPrinterGetPrinterResolutionCount)
+	(JNIEnv *env, jclass that, jlong arg0, jintArray arg1)
 {
 	jint *lparg1=NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, PMPrinterGetPrinterResolutionCount_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetIntArrayElements(env, arg1, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)PMPrinterGetPrinterResolutionCount((PMPrinter)arg0, (UInt32 *)lparg1);
+	rc = (jlong)PMPrinterGetPrinterResolutionCount((PMPrinter)arg0, (UInt32 *)lparg1);
 */
 	{
 		OS_LOAD_FUNCTION(fp, PMPrinterGetPrinterResolutionCount)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrinter, UInt32 *))fp)((PMPrinter)arg0, (UInt32 *)lparg1);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(PMPrinter, UInt32 *))fp)((PMPrinter)arg0, (UInt32 *)lparg1);
 		}
 	}
 fail:
@@ -5691,44 +5691,44 @@ fail:
 #endif
 
 #ifndef NO_PMSessionGetCurrentPrinter
-JNIEXPORT jintLong JNICALL OS_NATIVE(PMSessionGetCurrentPrinter)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(PMSessionGetCurrentPrinter)
+	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
 {
-	jintLong *lparg1=NULL;
-	jintLong rc = 0;
+	jlong *lparg1=NULL;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, PMSessionGetCurrentPrinter_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 = (jintLong)PMSessionGetCurrentPrinter((PMPrintSession)arg0, (PMPrinter *)lparg1);
+	rc = (jlong)PMSessionGetCurrentPrinter((PMPrintSession)arg0, (PMPrinter *)lparg1);
 */
 	{
 		OS_LOAD_FUNCTION(fp, PMSessionGetCurrentPrinter)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrintSession, PMPrinter *))fp)((PMPrintSession)arg0, (PMPrinter *)lparg1);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(PMPrintSession, PMPrinter *))fp)((PMPrintSession)arg0, (PMPrinter *)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, PMSessionGetCurrentPrinter_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_PMSessionGetDestinationType
-JNIEXPORT jintLong JNICALL OS_NATIVE(PMSessionGetDestinationType)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jshortArray arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(PMSessionGetDestinationType)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jshortArray arg2)
 {
 	jshort *lparg2=NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, PMSessionGetDestinationType_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetShortArrayElements(env, arg2, NULL)) == NULL) goto fail;
 /*
-	rc = (jintLong)PMSessionGetDestinationType((PMPrintSession)arg0, (PMPrintSettings)arg1, lparg2);
+	rc = (jlong)PMSessionGetDestinationType((PMPrintSession)arg0, (PMPrintSettings)arg1, lparg2);
 */
 	{
 		OS_LOAD_FUNCTION(fp, PMSessionGetDestinationType)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrintSession, PMPrintSettings, jshort *))fp)((PMPrintSession)arg0, (PMPrintSettings)arg1, lparg2);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(PMPrintSession, PMPrintSettings, jshort *))fp)((PMPrintSession)arg0, (PMPrintSettings)arg1, lparg2);
 		}
 	}
 fail:
@@ -5739,18 +5739,18 @@ fail:
 #endif
 
 #ifndef NO_PMSetDuplex
-JNIEXPORT jintLong JNICALL OS_NATIVE(PMSetDuplex)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(PMSetDuplex)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, PMSetDuplex_FUNC);
 /*
-	rc = (jintLong)PMSetDuplex((PMPrintSettings)arg0, (PMDuplexMode)arg1);
+	rc = (jlong)PMSetDuplex((PMPrintSettings)arg0, (PMDuplexMode)arg1);
 */
 	{
 		OS_LOAD_FUNCTION(fp, PMSetDuplex)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(PMPrintSettings, PMDuplexMode))fp)((PMPrintSettings)arg0, (PMDuplexMode)arg1);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(PMPrintSettings, PMDuplexMode))fp)((PMPrintSettings)arg0, (PMDuplexMode)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, PMSetDuplex_FUNC);
@@ -5760,7 +5760,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(PMSetDuplex)
 
 #ifndef NO_PtInRgn
 JNIEXPORT jboolean JNICALL OS_NATIVE(PtInRgn)
-	(JNIEnv *env, jclass that, jshortArray arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jshortArray arg0, jlong arg1)
 {
 	jshort *lparg0=NULL;
 	jboolean rc = 0;
@@ -5772,7 +5772,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(PtInRgn)
 	{
 		OS_LOAD_FUNCTION(fp, PtInRgn)
 		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(Point, jintLong))fp)(*(Point *)lparg0, arg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(Point, jlong))fp)(*(Point *)lparg0, arg1);
 		}
 	}
 fail:
@@ -5784,7 +5784,7 @@ fail:
 
 #ifndef NO_QDRegionToRects
 JNIEXPORT jint JNICALL OS_NATIVE(QDRegionToRects)
-	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3)
 {
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, QDRegionToRects_FUNC);
@@ -5794,7 +5794,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(QDRegionToRects)
 	{
 		OS_LOAD_FUNCTION(fp, QDRegionToRects)
 		if (fp) {
-			rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3);
+			rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jint, jlong, jlong))fp)(arg0, arg1, arg2, arg3);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, QDRegionToRects_FUNC);
@@ -5804,7 +5804,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(QDRegionToRects)
 
 #ifndef NO_RectInRgn
 JNIEXPORT jboolean JNICALL OS_NATIVE(RectInRgn)
-	(JNIEnv *env, jclass that, jshortArray arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jshortArray arg0, jlong arg1)
 {
 	jshort *lparg0=NULL;
 	jboolean rc = 0;
@@ -5816,7 +5816,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(RectInRgn)
 	{
 		OS_LOAD_FUNCTION(fp, RectInRgn)
 		if (fp) {
-			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jshort *, jintLong))fp)(lparg0, arg1);
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jshort *, jlong))fp)(lparg0, arg1);
 		}
 	}
 fail:
@@ -5828,7 +5828,7 @@ fail:
 
 #ifndef NO_RectRgn
 JNIEXPORT void JNICALL OS_NATIVE(RectRgn)
-	(JNIEnv *env, jclass that, jintLong arg0, jshortArray arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jshortArray arg1)
 {
 	jshort *lparg1=NULL;
 	OS_NATIVE_ENTER(env, that, RectRgn_FUNC);
@@ -5839,7 +5839,7 @@ JNIEXPORT void JNICALL OS_NATIVE(RectRgn)
 	{
 		OS_LOAD_FUNCTION(fp, RectRgn)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jshort *))fp)(arg0, lparg1);
+			((void (CALLING_CONVENTION*)(jlong, jshort *))fp)(arg0, lparg1);
 		}
 	}
 fail:
@@ -5850,15 +5850,15 @@ fail:
 
 #ifndef NO_SecPolicySearchCopyNext
 JNIEXPORT jint JNICALL OS_NATIVE(SecPolicySearchCopyNext)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLongArray arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlongArray arg1)
 {
-	jintLong *lparg1=NULL;
+	jlong *lparg1=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SecPolicySearchCopyNext_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 = (jint)SecPolicySearchCopyNext((SecPolicySearchRef)arg0, (SecPolicyRef *)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, SecPolicySearchCopyNext_FUNC);
 	return rc;
 }
@@ -5866,15 +5866,15 @@ fail:
 
 #ifndef NO_SecPolicySearchCreate
 JNIEXPORT jint JNICALL OS_NATIVE(SecPolicySearchCreate)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLongArray arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlongArray arg3)
 {
-	jintLong *lparg3=NULL;
+	jlong *lparg3=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SecPolicySearchCreate_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 = (jint)SecPolicySearchCreate((CSSM_CERT_TYPE)arg0, (CSSM_OID *)arg1, (CSSM_DATA *)arg2, (SecPolicySearchRef *)lparg3);
 fail:
-	if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0);
+	if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0);
 	OS_NATIVE_EXIT(env, that, SecPolicySearchCreate_FUNC);
 	return rc;
 }
@@ -5882,15 +5882,15 @@ fail:
 
 #ifndef NO_SecTrustCreateWithCertificates
 JNIEXPORT jint JNICALL OS_NATIVE(SecTrustCreateWithCertificates)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2)
 {
-	jintLong *lparg2=NULL;
+	jlong *lparg2=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, SecTrustCreateWithCertificates_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 = (jint)SecTrustCreateWithCertificates((CFArrayRef)arg0, (CFTypeRef)arg1, (SecTrustRef *)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, SecTrustCreateWithCertificates_FUNC);
 	return rc;
 }
@@ -5898,7 +5898,7 @@ fail:
 
 #ifndef NO_SectRgn
 JNIEXPORT void JNICALL OS_NATIVE(SectRgn)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
 {
 	OS_NATIVE_ENTER(env, that, SectRgn_FUNC);
 /*
@@ -5907,7 +5907,7 @@ JNIEXPORT void JNICALL OS_NATIVE(SectRgn)
 	{
 		OS_LOAD_FUNCTION(fp, SectRgn)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2);
+			((void (CALLING_CONVENTION*)(jlong, jlong, jlong))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, SectRgn_FUNC);
@@ -5977,18 +5977,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetThemeCursor)
 #endif
 
 #ifndef NO_TISCopyCurrentKeyboardInputSource
-JNIEXPORT jintLong JNICALL OS_NATIVE(TISCopyCurrentKeyboardInputSource)
+JNIEXPORT jlong JNICALL OS_NATIVE(TISCopyCurrentKeyboardInputSource)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, TISCopyCurrentKeyboardInputSource_FUNC);
 /*
-	rc = (jintLong)TISCopyCurrentKeyboardInputSource();
+	rc = (jlong)TISCopyCurrentKeyboardInputSource();
 */
 	{
 		OS_LOAD_FUNCTION(fp, TISCopyCurrentKeyboardInputSource)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)();
+			rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)();
 		}
 	}
 	OS_NATIVE_EXIT(env, that, TISCopyCurrentKeyboardInputSource_FUNC);
@@ -5997,18 +5997,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(TISCopyCurrentKeyboardInputSource)
 #endif
 
 #ifndef NO_TISGetInputSourceProperty
-JNIEXPORT jintLong JNICALL OS_NATIVE(TISGetInputSourceProperty)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(TISGetInputSourceProperty)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, TISGetInputSourceProperty_FUNC);
 /*
-	rc = (jintLong)TISGetInputSourceProperty((TISInputSourceRef)arg0, (CFStringRef)arg1);
+	rc = (jlong)TISGetInputSourceProperty((TISInputSourceRef)arg0, (CFStringRef)arg1);
 */
 	{
 		OS_LOAD_FUNCTION(fp, TISGetInputSourceProperty)
 		if (fp) {
-			rc = (jintLong)((jintLong (CALLING_CONVENTION*)(TISInputSourceRef, CFStringRef))fp)((TISInputSourceRef)arg0, (CFStringRef)arg1);
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(TISInputSourceRef, CFStringRef))fp)((TISInputSourceRef)arg0, (CFStringRef)arg1);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, TISGetInputSourceProperty_FUNC);
@@ -6034,7 +6034,7 @@ fail:
 
 #ifndef NO_UCKeyTranslate
 JNIEXPORT jint JNICALL OS_NATIVE(UCKeyTranslate)
-	(JNIEnv *env, jclass that, jintLong arg0, jshort arg1, jshort arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jint arg7, jintArray arg8, jcharArray arg9)
+	(JNIEnv *env, jclass that, jlong arg0, jshort arg1, jshort arg2, jint arg3, jint arg4, jint arg5, jintArray arg6, jint arg7, jintArray arg8, jcharArray arg9)
 {
 	jint *lparg6=NULL;
 	jint *lparg8=NULL;
@@ -6064,7 +6064,7 @@ fail:
 
 #ifndef NO_UTTypeEqual
 JNIEXPORT jboolean JNICALL OS_NATIVE(UTTypeEqual)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, UTTypeEqual_FUNC);
@@ -6076,7 +6076,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(UTTypeEqual)
 
 #ifndef NO_UnionRgn
 JNIEXPORT void JNICALL OS_NATIVE(UnionRgn)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
 {
 	OS_NATIVE_ENTER(env, that, UnionRgn_FUNC);
 /*
@@ -6085,7 +6085,7 @@ JNIEXPORT void JNICALL OS_NATIVE(UnionRgn)
 	{
 		OS_LOAD_FUNCTION(fp, UnionRgn)
 		if (fp) {
-			((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2);
+			((void (CALLING_CONVENTION*)(jlong, jlong, jlong))fp)(arg0, arg1, arg2);
 		}
 	}
 	OS_NATIVE_EXIT(env, that, UnionRgn_FUNC);
@@ -6094,7 +6094,7 @@ JNIEXPORT void JNICALL OS_NATIVE(UnionRgn)
 
 #ifndef NO_call
 JNIEXPORT void JNICALL OS_NATIVE(call)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
 {
 	OS_NATIVE_ENTER(env, that, call_FUNC);
 	((void (*)())arg0)(arg1, arg2);
@@ -6104,7 +6104,7 @@ JNIEXPORT void JNICALL OS_NATIVE(call)
 
 #ifndef NO_class_1addIvar
 JNIEXPORT jboolean JNICALL OS_NATIVE(class_1addIvar)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jbyte arg3, jbyteArray arg4)
+	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jbyte arg3, jbyteArray arg4)
 {
 	jbyte *lparg1=NULL;
 	jbyte *lparg4=NULL;
@@ -6123,7 +6123,7 @@ fail:
 
 #ifndef NO_class_1addMethod
 JNIEXPORT jboolean JNICALL OS_NATIVE(class_1addMethod)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jstring arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jstring arg3)
 {
 	const char *lparg3= NULL;
 	jboolean rc = 0;
@@ -6139,7 +6139,7 @@ fail:
 
 #ifndef NO_class_1addProtocol
 JNIEXPORT jboolean JNICALL OS_NATIVE(class_1addProtocol)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
 	jboolean rc = 0;
 	OS_NATIVE_ENTER(env, that, class_1addProtocol_FUNC);
@@ -6150,60 +6150,60 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(class_1addProtocol)
 #endif
 
 #ifndef NO_class_1createInstance
-JNIEXPORT jintLong JNICALL OS_NATIVE(class_1createInstance)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(class_1createInstance)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, class_1createInstance_FUNC);
-	rc = (jintLong)class_createInstance((Class)arg0, (size_t)arg1);
+	rc = (jlong)class_createInstance((Class)arg0, (size_t)arg1);
 	OS_NATIVE_EXIT(env, that, class_1createInstance_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_class_1getClassMethod
-JNIEXPORT jintLong JNICALL OS_NATIVE(class_1getClassMethod)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(class_1getClassMethod)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, class_1getClassMethod_FUNC);
-	rc = (jintLong)class_getClassMethod((Class)arg0, (SEL)arg1);
+	rc = (jlong)class_getClassMethod((Class)arg0, (SEL)arg1);
 	OS_NATIVE_EXIT(env, that, class_1getClassMethod_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_class_1getInstanceMethod
-JNIEXPORT jintLong JNICALL OS_NATIVE(class_1getInstanceMethod)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(class_1getInstanceMethod)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, class_1getInstanceMethod_FUNC);
-	rc = (jintLong)class_getInstanceMethod((Class)arg0, (SEL)arg1);
+	rc = (jlong)class_getInstanceMethod((Class)arg0, (SEL)arg1);
 	OS_NATIVE_EXIT(env, that, class_1getInstanceMethod_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_class_1getMethodImplementation
-JNIEXPORT jintLong JNICALL OS_NATIVE(class_1getMethodImplementation)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(class_1getMethodImplementation)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, class_1getMethodImplementation_FUNC);
-	rc = (jintLong)class_getMethodImplementation((Class)arg0, (SEL)arg1);
+	rc = (jlong)class_getMethodImplementation((Class)arg0, (SEL)arg1);
 	OS_NATIVE_EXIT(env, that, class_1getMethodImplementation_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_class_1getSuperclass
-JNIEXPORT jintLong JNICALL OS_NATIVE(class_1getSuperclass)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(class_1getSuperclass)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, class_1getSuperclass_FUNC);
-	rc = (jintLong)class_getSuperclass((Class)arg0);
+	rc = (jlong)class_getSuperclass((Class)arg0);
 	OS_NATIVE_EXIT(env, that, class_1getSuperclass_FUNC);
 	return rc;
 }
@@ -6240,384 +6240,274 @@ JNIEXPORT void JNICALL OS_NATIVE(instrumentObjcMessageSends)
 #endif
 
 #ifndef NO_kCFAllocatorDefault
-JNIEXPORT jintLong JNICALL OS_NATIVE(kCFAllocatorDefault)
+JNIEXPORT jlong JNICALL OS_NATIVE(kCFAllocatorDefault)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, kCFAllocatorDefault_FUNC);
-	rc = (jintLong)kCFAllocatorDefault;
+	rc = (jlong)kCFAllocatorDefault;
 	OS_NATIVE_EXIT(env, that, kCFAllocatorDefault_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_kCFRunLoopCommonModes
-JNIEXPORT jintLong JNICALL OS_NATIVE(kCFRunLoopCommonModes)
+JNIEXPORT jlong JNICALL OS_NATIVE(kCFRunLoopCommonModes)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, kCFRunLoopCommonModes_FUNC);
-	rc = (jintLong)kCFRunLoopCommonModes;
+	rc = (jlong)kCFRunLoopCommonModes;
 	OS_NATIVE_EXIT(env, that, kCFRunLoopCommonModes_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_kCFTypeDictionaryKeyCallBacks
-JNIEXPORT jintLong JNICALL OS_NATIVE(kCFTypeDictionaryKeyCallBacks)
+JNIEXPORT jlong JNICALL OS_NATIVE(kCFTypeDictionaryKeyCallBacks)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, kCFTypeDictionaryKeyCallBacks_FUNC);
-	rc = (jintLong)&kCFTypeDictionaryKeyCallBacks;
+	rc = (jlong)&kCFTypeDictionaryKeyCallBacks;
 	OS_NATIVE_EXIT(env, that, kCFTypeDictionaryKeyCallBacks_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_kCFTypeDictionaryValueCallBacks
-JNIEXPORT jintLong JNICALL OS_NATIVE(kCFTypeDictionaryValueCallBacks)
+JNIEXPORT jlong JNICALL OS_NATIVE(kCFTypeDictionaryValueCallBacks)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, kCFTypeDictionaryValueCallBacks_FUNC);
-	rc = (jintLong)&kCFTypeDictionaryValueCallBacks;
+	rc = (jlong)&kCFTypeDictionaryValueCallBacks;
 	OS_NATIVE_EXIT(env, that, kCFTypeDictionaryValueCallBacks_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_kCTFontAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(kCTFontAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(kCTFontAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, kCTFontAttributeName_FUNC);
-	rc = (jintLong)kCTFontAttributeName;
+	rc = (jlong)kCTFontAttributeName;
 	OS_NATIVE_EXIT(env, that, kCTFontAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_kCTForegroundColorAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(kCTForegroundColorAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(kCTForegroundColorAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, kCTForegroundColorAttributeName_FUNC);
-	rc = (jintLong)kCTForegroundColorAttributeName;
+	rc = (jlong)kCTForegroundColorAttributeName;
 	OS_NATIVE_EXIT(env, that, kCTForegroundColorAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_kCTParagraphStyleAttributeName
-JNIEXPORT jintLong JNICALL OS_NATIVE(kCTParagraphStyleAttributeName)
+JNIEXPORT jlong JNICALL OS_NATIVE(kCTParagraphStyleAttributeName)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, kCTParagraphStyleAttributeName_FUNC);
-	rc = (jintLong)kCTParagraphStyleAttributeName;
+	rc = (jlong)kCTParagraphStyleAttributeName;
 	OS_NATIVE_EXIT(env, that, kCTParagraphStyleAttributeName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_kUTTypeFileURL
-JNIEXPORT jintLong JNICALL OS_NATIVE(kUTTypeFileURL)
+JNIEXPORT jlong JNICALL OS_NATIVE(kUTTypeFileURL)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, kUTTypeFileURL_FUNC);
-	rc = (jintLong)kUTTypeFileURL;
+	rc = (jlong)kUTTypeFileURL;
 	OS_NATIVE_EXIT(env, that, kUTTypeFileURL_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_kUTTypeURL
-JNIEXPORT jintLong JNICALL OS_NATIVE(kUTTypeURL)
+JNIEXPORT jlong JNICALL OS_NATIVE(kUTTypeURL)
 	(JNIEnv *env, jclass that)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, kUTTypeURL_FUNC);
-	rc = (jintLong)kUTTypeURL;
+	rc = (jlong)kUTTypeURL;
 	OS_NATIVE_EXIT(env, that, kUTTypeURL_FUNC);
 	return rc;
 }
 #endif
 
-#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_CGPathElement_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_CGPathElement_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_CGPathElement_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_CGPathElement_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
-#endif
+#ifndef NO_memmove__JLorg_eclipse_swt_internal_cocoa_CGPathElement_2J
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_CGPathElement_2J)
+	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
 {
 	CGPathElement _arg1, *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGPathElement_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGPathElement_2J_FUNC);
-#endif
 	if (arg1) if ((lparg1 = getCGPathElementFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setCGPathElementFields(env, arg1, lparg1);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_CGPathElement_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_CGPathElement_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
-#endif
+#ifndef NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J)
+	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
 {
 	NSPoint _arg1, *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
-#endif
 	if (arg1) if ((lparg1 = getNSPointFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setNSPointFields(env, arg1, lparg1);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
-#endif
+#ifndef NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J)
+	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
 {
 	NSRange _arg1, *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
-#endif
 	if (arg1) if ((lparg1 = getNSRangeFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setNSRangeFields(env, arg1, lparg1);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
-#endif
+#ifndef NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J)
+	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
 {
 	NSRect _arg1, *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	if (arg1) if ((lparg1 = getNSRectFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setNSRectFields(env, arg1, lparg1);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I) && !defined(JNI64)) || (!defined(NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J)(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
-#endif
+#ifndef NO_memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J
+JNIEXPORT void JNICALL OS_NATIVE(memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J)
+	(JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2)
 {
 	NSSize _arg1, *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC);
-#endif
 	if (arg1) if ((lparg1 = getNSSizeFields(env, arg1, &_arg1)) == NULL) goto fail;
 	memmove((void *)arg0, (void *)lparg1, arg2);
 fail:
 	if (arg1 && lparg1) setNSSizeFields(env, arg1, lparg1);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2JJ
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2JJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
 {
 	CGPathElement _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2JJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setCGPathElementFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2JJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
 {
 	NSPoint _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNSPointFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
 {
 	NSRange _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNSRangeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
 {
 	NSRect _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II) && !defined(JNI64)) || (!defined(NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ
+JNIEXPORT void JNICALL OS_NATIVE(memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
 {
 	NSSize _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = &_arg0) == NULL) goto fail;
 	memmove((void *)lparg0, (void *)arg1, arg2);
 fail:
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC);
-#endif
 }
 #endif
 
 #ifndef NO_method_1setImplementation
-JNIEXPORT jintLong JNICALL OS_NATIVE(method_1setImplementation)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(method_1setImplementation)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, method_1setImplementation_FUNC);
-	rc = (jintLong)method_setImplementation((Method)arg0, (IMP)arg1);
+	rc = (jlong)method_setImplementation((Method)arg0, (IMP)arg1);
 	OS_NATIVE_EXIT(env, that, method_1setImplementation_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_objc_1allocateClassPair
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1allocateClassPair)
-	(JNIEnv *env, jclass that, jintLong arg0, jstring arg1, jintLong arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1allocateClassPair)
+	(JNIEnv *env, jclass that, jlong arg0, jstring arg1, jlong arg2)
 {
 	const char *lparg1= NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1allocateClassPair_FUNC);
 	if (arg1) if ((lparg1 = (*env)->GetStringUTFChars(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)objc_allocateClassPair((Class)arg0, lparg1, arg2);
+	rc = (jlong)objc_allocateClassPair((Class)arg0, lparg1, arg2);
 fail:
 	if (arg1 && lparg1) (*env)->ReleaseStringUTFChars(env, arg1, lparg1);
 	OS_NATIVE_EXIT(env, that, objc_1allocateClassPair_FUNC);
@@ -6627,7 +6517,7 @@ fail:
 
 #ifndef NO_objc_1disposeClassPair
 JNIEXPORT void JNICALL OS_NATIVE(objc_1disposeClassPair)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, objc_1disposeClassPair_FUNC);
 	objc_disposeClassPair((Class)arg0);
@@ -6636,14 +6526,14 @@ JNIEXPORT void JNICALL OS_NATIVE(objc_1disposeClassPair)
 #endif
 
 #ifndef NO_objc_1getClass
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1getClass)
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1getClass)
 	(JNIEnv *env, jclass that, jstring arg0)
 {
 	const char *lparg0= NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1getClass_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetStringUTFChars(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)objc_getClass(lparg0);
+	rc = (jlong)objc_getClass(lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseStringUTFChars(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, objc_1getClass_FUNC);
@@ -6652,14 +6542,14 @@ fail:
 #endif
 
 #ifndef NO_objc_1getMetaClass
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1getMetaClass)
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1getMetaClass)
 	(JNIEnv *env, jclass that, jstring arg0)
 {
 	const char *lparg0= NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1getMetaClass_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetStringUTFChars(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)objc_getMetaClass(lparg0);
+	rc = (jlong)objc_getMetaClass(lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseStringUTFChars(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, objc_1getMetaClass_FUNC);
@@ -6668,14 +6558,14 @@ fail:
 #endif
 
 #ifndef NO_objc_1getProtocol
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1getProtocol)
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1getProtocol)
 	(JNIEnv *env, jclass that, jstring arg0)
 {
 	const char *lparg0= NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1getProtocol_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetStringUTFChars(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)objc_getProtocol(lparg0);
+	rc = (jlong)objc_getProtocol(lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseStringUTFChars(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, objc_1getProtocol_FUNC);
@@ -6684,14 +6574,14 @@ fail:
 #endif
 
 #ifndef NO_objc_1lookUpClass
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1lookUpClass)
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1lookUpClass)
 	(JNIEnv *env, jclass that, jstring arg0)
 {
 	const char *lparg0= NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1lookUpClass_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetStringUTFChars(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)objc_lookUpClass(lparg0);
+	rc = (jlong)objc_lookUpClass(lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseStringUTFChars(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, objc_1lookUpClass_FUNC);
@@ -6699,1942 +6589,1138 @@ fail:
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-#endif
+#ifndef NO_objc_1msgSend__JJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong))objc_msgSend)(arg0, arg1);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong))objc_msgSend)(arg0, arg1);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IID) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJD) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IID)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2)
-#endif
+#ifndef NO_objc_1msgSend__JJD
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJD)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IID_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJD_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jdouble))objc_msgSend)(arg0, arg1, arg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IID_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jdouble))objc_msgSend)(arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJD_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIDIIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJDJJJZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIDIIIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jintLong arg3, jintLong arg4, jintLong arg5, jboolean arg6)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJDJJJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jdouble arg2, jintLong arg3, jintLong arg4, jintLong arg5, jboolean arg6)
-#endif
+#ifndef NO_objc_1msgSend__JJDD
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJDD)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIDIIIZ_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJDJJJZ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jdouble, jintLong, jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIDIIIZ_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJDJJJZ_FUNC);
-#endif
+	jlong rc = 0;
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJDD_FUNC);
+	rc = (jlong)((jlong (*)(jlong, jlong, jdouble, jdouble))objc_msgSend)(arg0, arg1, arg2, arg3);
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJDD_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__IIF
-JNIEXPORT jint JNICALL OS_NATIVE(objc_1msgSend__IIF)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jfloat arg2)
+#ifndef NO_objc_1msgSend__JJDDDD
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJDDDD)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jdouble arg3, jdouble arg4, jdouble arg5)
 {
-	jint rc = 0;
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIF_FUNC);
-	rc = (jint)((jint (*)(jint, jint, jfloat))objc_msgSend)(arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIF_FUNC);
+	jlong rc = 0;
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJDDDD_FUNC);
+	rc = (jlong)((jlong (*)(jlong, jlong, jdouble, jdouble, jdouble, jdouble))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJDDDD_FUNC);
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIFF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJDD) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIFF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jfloatDouble arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJDD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jfloatDouble arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJDJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJDJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jlong arg3)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIFF_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJDD_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jfloatDouble, jfloatDouble))objc_msgSend)(arg0, arg1, arg2, arg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIFF_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJDD_FUNC);
-#endif
+	jlong rc = 0;
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJDJ_FUNC);
+	rc = (jlong)((jlong (*)(jlong, jlong, jdouble, jlong))objc_msgSend)(arg0, arg1, arg2, arg3);
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJDJ_FUNC);
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIFFFF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJDDDD) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIFFFF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJDDDD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5)
-#endif
+#ifndef NO_objc_1msgSend__JJDJJJZ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJDJJJZ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdouble arg2, jlong arg3, jlong arg4, jlong arg5, jboolean arg6)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIFFFF_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJDDDD_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jfloatDouble, jfloatDouble, jfloatDouble, jfloatDouble))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIFFFF_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJDDDD_FUNC);
-#endif
+	jlong rc = 0;
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJDJJJZ_FUNC);
+	rc = (jlong)((jlong (*)(jlong, jlong, jdouble, jlong, jlong, jlong, jboolean))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJDJJJZ_FUNC);
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIFI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJDJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIFI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJDJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDouble arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJI
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJI)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIFI_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJDJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jfloatDouble, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIFI_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJDJ_FUNC);
-#endif
+	jlong rc = 0;
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJI_FUNC);
+	rc = (jlong)((jlong (*)(jlong, jlong, jint))objc_msgSend)(arg0, arg1, arg2);
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJI_FUNC);
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_objc_1msgSend__JJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__III_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__III_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong))objc_msgSend)(arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJD) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jfloatDouble arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jfloatDouble arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJJD
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJD)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jdouble arg3)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIF_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJD_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jfloatDouble))objc_msgSend)(arg0, arg1, arg2, arg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIF_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jdouble))objc_msgSend)(arg0, arg1, arg2, arg3);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJD_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIII_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIII_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong))objc_msgSend)(arg0, arg1, arg2, arg3);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIIDI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJDJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIDI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jdouble arg4, jintLong arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJDJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jdouble arg4, jintLong arg5)
-#endif
+#ifndef NO_objc_1msgSend__JJJJDJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJDJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jdouble arg4, jlong arg5)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIDI_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJDJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jdouble, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIDI_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jdouble, jlong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJDJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJJJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIII_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIII_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jlong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIIIF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJD) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIIF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jfloatDouble arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jfloatDouble arg5)
-#endif
+#ifndef NO_objc_1msgSend__JJJJJD
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJJD)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jdouble arg5)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIIF_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJD_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jfloatDouble))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIIF_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jlong, jdouble))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJD_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5)
-#endif
+#ifndef NO_objc_1msgSend__JJJJJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIII_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIII_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jlong, jlong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
-#endif
+#ifndef NO_objc_1msgSend__JJJJJJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIIII_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJJJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIIII_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jlong, jlong, jlong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIIIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7)
-#endif
+#ifndef NO_objc_1msgSend__JJJJJJJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIIIII_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJJJJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIIIII_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jlong, jlong, jlong, jlong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIIIIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7, jintLong arg8)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7, jintLong arg8)
-#endif
+#ifndef NO_objc_1msgSend__JJJJJJJJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIIIIII_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJJJJJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIIIIII_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jlong, jlong, jlong, jlong, jlong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJJJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIIIIIZZIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJJJZZJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIIIIZZIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jboolean arg7, jboolean arg8, jintLong arg9, jintLong arg10, jintLong arg11)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJZZJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jboolean arg7, jboolean arg8, jintLong arg9, jintLong arg10, jintLong arg11)
-#endif
+#ifndef NO_objc_1msgSend__JJJJJJJZZJJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJZZJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jboolean arg7, jboolean arg8, jlong arg9, jlong arg10, jlong arg11)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIIIIZZIII_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJJJZZJJJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jboolean, jboolean, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIIIIZZIII_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jlong, jlong, jlong, jboolean, jboolean, jlong, jlong, jlong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJJJZZJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIIIIIZZIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJJJZZJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIIIIZZIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jboolean arg7, jboolean arg8, jintLong arg9, jintLong arg10, jintLong arg11, jintLong arg12)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJZZJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jboolean arg7, jboolean arg8, jintLong arg9, jintLong arg10, jintLong arg11, jintLong arg12)
-#endif
+#ifndef NO_objc_1msgSend__JJJJJJJZZJJJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJJJJZZJJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jboolean arg7, jboolean arg8, jlong arg9, jlong arg10, jlong arg11, jlong arg12)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIIIIZZIIII_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJJJZZJJJJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jboolean, jboolean, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIIIIZZIIII_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jlong, jlong, jlong, jboolean, jboolean, jlong, jlong, jlong, jlong))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJJJZZJJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJJZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jboolean arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jboolean arg5)
-#endif
+#ifndef NO_objc_1msgSend__JJJJJZ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJJZ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jboolean arg5)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIIZ_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJJZ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIIZ_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jlong, jboolean))objc_msgSend)(arg0, arg1, arg2, arg3, arg4, arg5);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJJZ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jobject arg4)
 {
 	NSRange _arg4, *lparg4=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#endif
 	if (arg4) if ((lparg4 = getNSRangeFields(env, arg4, &_arg4)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, NSRange))objc_msgSend)(arg0, arg1, arg2, arg3, *lparg4);
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, NSRange))objc_msgSend)(arg0, arg1, arg2, arg3, *lparg4);
 fail:
 	if (arg4 && lparg4) setNSRangeFields(env, arg4, lparg4);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJJZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jboolean arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJJJZ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJJZ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jboolean arg4)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIIZ_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJJZ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, arg2, arg3, arg4);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIIZ_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jlong, jboolean))objc_msgSend)(arg0, arg1, arg2, arg3, arg4);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJJZ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3)
 {
 	NSPoint _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, NSPoint))objc_msgSend)(arg0, arg1, arg2, *lparg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, NSPoint))objc_msgSend)(arg0, arg1, arg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2J
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2J)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4)
 {
 	NSPoint _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
-#endif
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, NSPoint, jintLong))objc_msgSend)(arg0, arg1, arg2, *lparg3, arg4);
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, NSPoint, jlong))objc_msgSend)(arg0, arg1, arg2, *lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4, jdouble arg5, jintLong arg6, jintLong arg7, jintLong arg8, jintLong arg9, jintLong arg10)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4, jdouble arg5, jintLong arg6, jintLong arg7, jintLong arg8, jintLong arg9, jintLong arg10)
-#endif
+#ifndef NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJJJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4, jdouble arg5, jlong arg6, jlong arg7, jlong arg8, jlong arg9, jlong arg10)
 {
 	NSPoint _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIIIII_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJJJJ_FUNC);
-#endif
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, NSPoint, jintLong, jdouble, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, *lparg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, NSPoint, jlong, jdouble, jlong, jlong, jlong, jlong, jlong))objc_msgSend)(arg0, arg1, arg2, *lparg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIIIII_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4, jdouble arg5, jintLong arg6, jintLong arg7, jshort arg8, jintLong arg9, jintLong arg10)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4, jdouble arg5, jintLong arg6, jintLong arg7, jshort arg8, jintLong arg9, jintLong arg10)
-#endif
+#ifndef NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4, jdouble arg5, jlong arg6, jlong arg7, jshort arg8, jlong arg9, jlong arg10)
 {
 	NSPoint _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ_FUNC);
-#endif
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, NSPoint, jintLong, jdouble, jintLong, jintLong, jshort, jintLong, jintLong))objc_msgSend)(arg0, arg1, arg2, *lparg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, NSPoint, jlong, jdouble, jlong, jlong, jshort, jlong, jlong))objc_msgSend)(arg0, arg1, arg2, *lparg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2IIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2JJJZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2IIIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jobject arg4, jintLong arg5, jintLong arg6, jintLong arg7, jboolean arg8)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2JJJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jobject arg4, jintLong arg5, jintLong arg6, jintLong arg7, jboolean arg8)
-#endif
+#ifndef NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2JJJZ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2JJJZ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3, jobject arg4, jlong arg5, jlong arg6, jlong arg7, jboolean arg8)
 {
 	NSPoint _arg3, *lparg3=NULL;
 	NSSize _arg4, *lparg4=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2IIIZ_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2JJJZ_FUNC);
-#endif
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getNSSizeFields(env, arg4, &_arg4)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, NSPoint, NSSize, jintLong, jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, arg2, *lparg3, *lparg4, arg5, arg6, arg7, arg8);
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, NSPoint, NSSize, jlong, jlong, jlong, jboolean))objc_msgSend)(arg0, arg1, arg2, *lparg3, *lparg4, arg5, arg6, arg7, arg8);
 fail:
 	if (arg4 && lparg4) setNSSizeFields(env, arg4, lparg4);
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2IIIZ_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2JJJZ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3)
 {
 	NSRange _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#endif
 	if (arg3) if ((lparg3 = getNSRangeFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, NSRange))objc_msgSend)(arg0, arg1, arg2, *lparg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, NSRange))objc_msgSend)(arg0, arg1, arg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSRangeFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRect_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRect_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4)
 {
 	NSRect _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, NSRect, jintLong))objc_msgSend)(arg0, arg1, arg2, *lparg3, arg4);
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, NSRect, jlong))objc_msgSend)(arg0, arg1, arg2, *lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJJZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jboolean arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJJZ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJJZ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jboolean arg3)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIIZ_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJJZ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, arg2, arg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIIZ_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong, jboolean))objc_msgSend)(arg0, arg1, arg2, arg3);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJJZ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2)
 {
 	NSAffineTransformStruct _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSAffineTransformStructFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSAffineTransformStruct))objc_msgSend)(arg0, arg1, *lparg2);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSAffineTransformStruct))objc_msgSend)(arg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSAffineTransformStructFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2)
 {
 	NSPoint _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint))objc_msgSend)(arg0, arg1, *lparg2);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSPoint))objc_msgSend)(arg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jdouble arg3, jdouble arg4, jdouble arg5)
 {
 	NSPoint _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, jfloatDouble, jfloatDouble, jfloatDouble))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSPoint, jdouble, jdouble, jdouble))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5);
 fail:
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5, jboolean arg6)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3, jfloatDouble arg4, jfloatDouble arg5, jboolean arg6)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jdouble arg3, jdouble arg4, jdouble arg5, jboolean arg6)
 {
 	NSPoint _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, jfloatDouble, jfloatDouble, jfloatDouble, jboolean))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5, arg6);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSPoint, jdouble, jdouble, jdouble, jboolean))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5, arg6);
 fail:
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jlong arg3)
 {
 	NSPoint _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, jintLong))objc_msgSend)(arg0, arg1, *lparg2, arg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSPoint, jlong))objc_msgSend)(arg0, arg1, *lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jfloatDoubleArray arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jfloatDoubleArray arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jlong arg3, jdoubleArray arg4)
 {
 	NSPoint _arg2, *lparg2=NULL;
-	jfloatDouble *lparg4=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F_FUNC);
-#else
+	jdouble *lparg4=NULL;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	if (arg4) if ((lparg4 = (*env)->GetFloatDoubleArrayElements(env, arg4, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, jintLong, jfloatDouble *))objc_msgSend)(arg0, arg1, *lparg2, arg3, lparg4);
+	if (arg4) if ((lparg4 = (*env)->GetDoubleArrayElements(env, arg4, NULL)) == NULL) goto fail;
+	rc = (jlong)((jlong (*)(jlong, jlong, NSPoint, jlong, jdouble *))objc_msgSend)(arg0, arg1, *lparg2, arg3, lparg4);
 fail:
-	if (arg4 && lparg4) (*env)->ReleaseFloatDoubleArrayElements(env, arg4, lparg4, 0);
+	if (arg4 && lparg4) (*env)->ReleaseDoubleArrayElements(env, arg4, lparg4, 0);
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jlong arg4)
 {
 	NSPoint _arg2, *lparg2=NULL;
 	NSPoint _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, NSPoint, jintLong))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, arg4);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSPoint, NSPoint, jlong))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jobject arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jobject arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jobject arg4)
 {
 	NSPoint _arg2, *lparg2=NULL;
 	NSPoint _arg3, *lparg3=NULL;
 	NSPoint _arg4, *lparg4=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getNSPointFields(env, arg4, &_arg4)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, NSPoint, NSPoint))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, *lparg4);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSPoint, NSPoint, NSPoint))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, *lparg4);
 fail:
 	if (arg4 && lparg4) setNSPointFields(env, arg4, lparg4);
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4, jfloatDouble arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4, jfloatDouble arg5)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jlong arg4, jdouble arg5)
 {
 	NSPoint _arg2, *lparg2=NULL;
 	NSRect _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSPoint, NSRect, jintLong, jfloatDouble))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, arg4, arg5);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSPoint, NSRect, jlong, jdouble))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, arg4, arg5);
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2)
 {
 	NSRange _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRangeFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRange))objc_msgSend)(arg0, arg1, *lparg2);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRange))objc_msgSend)(arg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSRangeFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jlong arg3)
 {
 	NSRange _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRangeFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRange, jintLong))objc_msgSend)(arg0, arg1, *lparg2, arg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRange, jlong))objc_msgSend)(arg0, arg1, *lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setNSRangeFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2IIII_3B) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2JJJJ_3B) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2IIII_3B)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jbyteArray arg7)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2JJJJ_3B)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6, jbyteArray arg7)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2JJJJ_3B
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2JJJJ_3B)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6, jbyteArray arg7)
 {
 	NSRange _arg2, *lparg2=NULL;
 	jbyte *lparg7=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2IIII_3B_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2JJJJ_3B_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRangeFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg7) if ((lparg7 = (*env)->GetByteArrayElements(env, arg7, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRange, jintLong, jintLong, jintLong, jintLong, jbyte *))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5, arg6, lparg7);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRange, jlong, jlong, jlong, jlong, jbyte *))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5, arg6, lparg7);
 fail:
 	if (arg7 && lparg7) (*env)->ReleaseByteArrayElements(env, arg7, lparg7, 0);
 	if (arg2 && lparg2) setNSRangeFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2IIII_3B_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2JJJJ_3B_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jobject arg3)
 {
 	NSRange _arg2, *lparg2=NULL;
 	NSPoint _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRangeFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRange, NSPoint))objc_msgSend)(arg0, arg1, *lparg2, *lparg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRange, NSPoint))objc_msgSend)(arg0, arg1, *lparg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSRangeFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2I_3I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2J_3J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2I_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4, jintLongArray arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2J_3J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4, jintLongArray arg5)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2J_3J
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2J_3J)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jlong arg4, jlongArray arg5)
 {
 	NSRange _arg2, *lparg2=NULL;
 	NSRange _arg3, *lparg3=NULL;
-	jintLong *lparg5=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2I_3I_FUNC);
-#else
+	jlong *lparg5=NULL;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2J_3J_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRangeFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRangeFields(env, arg3, &_arg3)) == NULL) goto fail;
-	if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRange, NSRange, jintLong, jintLong *))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, arg4, lparg5);
+	if (arg5) if ((lparg5 = (*env)->GetLongArrayElements(env, arg5, NULL)) == NULL) goto fail;
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRange, NSRange, jlong, jlong *))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, arg4, lparg5);
 fail:
-	if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0);
+	if (arg5 && lparg5) (*env)->ReleaseLongArrayElements(env, arg5, lparg5, 0);
 	if (arg3 && lparg3) setNSRangeFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSRangeFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2I_3I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2J_3J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2)
 {
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect))objc_msgSend)(arg0, arg1, *lparg2);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect))objc_msgSend)(arg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jdouble arg3)
 {
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jfloatDouble))objc_msgSend)(arg0, arg1, *lparg2, arg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, jdouble))objc_msgSend)(arg0, arg1, *lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3, jfloatDouble arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jfloatDouble arg3, jfloatDouble arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jdouble arg3, jdouble arg4)
 {
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jfloatDouble, jfloatDouble))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, jdouble, jdouble))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jlong arg3)
 {
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jintLong))objc_msgSend)(arg0, arg1, *lparg2, arg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, jlong))objc_msgSend)(arg0, arg1, *lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jlong arg3, jlong arg4)
 {
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jintLong, jintLong))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, jlong, jlong))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4, jintLong arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4, jintLong arg5)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jlong arg3, jlong arg4, jlong arg5)
 {
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2III_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJJ_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jintLong, jintLong, jintLong))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, jlong, jlong, jlong))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2III_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4, jboolean arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4, jboolean arg5)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jlong arg3, jlong arg4, jboolean arg5)
 {
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, jlong, jlong, jboolean))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4, jboolean arg5, jintLong arg6)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jintLong arg4, jboolean arg5, jintLong arg6)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jlong arg3, jlong arg4, jboolean arg5, jlong arg6)
 {
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jintLong, jintLong, jboolean, jintLong))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5, arg6);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, jlong, jlong, jboolean, jlong))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5, arg6);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jboolean arg4, jintLong arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3, jboolean arg4, jintLong arg5)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jlong arg3, jboolean arg4, jlong arg5)
 {
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jintLong, jboolean, jintLong))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, jlong, jboolean, jlong))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4, arg5);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jobject arg3)
 {
 	NSRect _arg2, *lparg2=NULL;
 	NSPoint _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, NSPoint))objc_msgSend)(arg0, arg1, *lparg2, *lparg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, NSPoint))objc_msgSend)(arg0, arg1, *lparg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jobject arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jobject arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jobject arg4)
 {
 	NSRect _arg2, *lparg2=NULL;
 	NSRange _arg3, *lparg3=NULL;
 	NSRect _arg4, *lparg4=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRangeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getNSRectFields(env, arg4, &_arg4)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, NSRange, NSRect))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, *lparg4);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, NSRange, NSRect))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, *lparg4);
 fail:
 	if (arg4 && lparg4) setNSRectFields(env, arg4, lparg4);
 	if (arg3 && lparg3) setNSRangeFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4, jfloatDouble arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3, jintLong arg4, jfloatDouble arg5)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jobject arg3, jlong arg4, jdouble arg5)
 {
 	NSRect _arg2, *lparg2=NULL;
 	NSRect _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, NSRect, jintLong, jfloatDouble))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, arg4, arg5);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, NSRect, jlong, jdouble))objc_msgSend)(arg0, arg1, *lparg2, *lparg3, arg4, arg5);
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jobject arg3)
 {
 	NSRect _arg2, *lparg2=NULL;
 	NSSize _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSSizeFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, NSSize))objc_msgSend)(arg0, arg1, *lparg2, *lparg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, NSSize))objc_msgSend)(arg0, arg1, *lparg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSSizeFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jboolean arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jboolean arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jboolean arg3)
 {
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jboolean))objc_msgSend)(arg0, arg1, *lparg2, arg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, jboolean))objc_msgSend)(arg0, arg1, *lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2ZZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2ZZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2ZZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jboolean arg3, jboolean arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2ZZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jboolean arg3, jboolean arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2ZZ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2ZZ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jboolean arg3, jboolean arg4)
 {
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2ZZ_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2ZZ_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSRect, jboolean, jboolean))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSRect, jboolean, jboolean))objc_msgSend)(arg0, arg1, *lparg2, arg3, arg4);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2ZZ_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2ZZ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#endif
+#ifndef NO_objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2)
 {
 	NSSize _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSSizeFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, NSSize))objc_msgSend)(arg0, arg1, *lparg2);
+	rc = (jlong)((jlong (*)(jlong, jlong, NSSize))objc_msgSend)(arg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSSizeFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJZ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2)
-#endif
+#ifndef NO_objc_1msgSend__JJZ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJZ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIZ_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJZ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jboolean))objc_msgSend)(arg0, arg1, arg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIZ_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jboolean))objc_msgSend)(arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJZ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIZI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJZJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIZI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJZJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJZJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJZJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2, jlong arg3)
 {
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIZI_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJZJ_FUNC);
-#endif
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jboolean, jintLong))objc_msgSend)(arg0, arg1, arg2, arg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIZI_FUNC);
-#else
+	rc = (jlong)((jlong (*)(jlong, jlong, jboolean, jlong))objc_msgSend)(arg0, arg1, arg2, arg3);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJZJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__IIZLorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJZLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__IIZLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJZLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jboolean arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJZLorg_eclipse_swt_internal_cocoa_NSRect_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJZLorg_eclipse_swt_internal_cocoa_NSRect_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jboolean arg2, jobject arg3)
 {
 	NSRect _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__IIZLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJZLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jboolean, NSRect))objc_msgSend)(arg0, arg1, arg2, *lparg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, jboolean, NSRect))objc_msgSend)(arg0, arg1, arg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__IIZLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJZLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__II_3B) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3B) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3B)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3B)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2)
-#endif
+#ifndef NO_objc_1msgSend__JJ_3B
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3B)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2)
 {
 	jbyte *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3B_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3B_FUNC);
-#endif
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jbyte *))objc_msgSend)(arg0, arg1, lparg2);
+	rc = (jlong)((jlong (*)(jlong, jlong, jbyte *))objc_msgSend)(arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3B_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3B_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__II_3BI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3BJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3BI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3BJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJ_3BJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3BJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jlong arg3)
 {
 	jbyte *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3BI_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3BJ_FUNC);
-#endif
 	if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jbyte *, jintLong))objc_msgSend)(arg0, arg1, lparg2, arg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, jbyte *, jlong))objc_msgSend)(arg0, arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3BI_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3BJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__II_3C) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3C) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3C)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3C)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2)
-#endif
+#ifndef NO_objc_1msgSend__JJ_3C
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3C)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jcharArray arg2)
 {
 	jchar *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3C_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3C_FUNC);
-#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jchar *))objc_msgSend)(arg0, arg1, lparg2);
+	rc = (jlong)((jlong (*)(jlong, jlong, jchar *))objc_msgSend)(arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3C_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3C_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__II_3CI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3CJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3CI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3CJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJ_3CJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3CJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jcharArray arg2, jlong arg3)
 {
 	jchar *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3CI_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3CJ_FUNC);
-#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jchar *, jintLong))objc_msgSend)(arg0, arg1, lparg2, arg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, jchar *, jlong))objc_msgSend)(arg0, arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3CI_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3CJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jcharArray arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jcharArray arg2, jobject arg3)
 {
 	jchar *lparg2=NULL;
 	NSRange _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = (*env)->GetCharArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRangeFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jchar *, NSRange))objc_msgSend)(arg0, arg1, lparg2, *lparg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, jchar *, NSRange))objc_msgSend)(arg0, arg1, lparg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSRangeFields(env, arg3, lparg3);
 	if (arg2 && lparg2) (*env)->ReleaseCharArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__II_3F) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3D) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3F)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDoubleArray arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3D)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDoubleArray arg2)
-#endif
+#ifndef NO_objc_1msgSend__JJ_3D
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3D)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdoubleArray arg2)
 {
-	jfloatDouble *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3F_FUNC);
-#else
+	jdouble *lparg2=NULL;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3D_FUNC);
-#endif
-	if (arg2) if ((lparg2 = (*env)->GetFloatDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jfloatDouble *))objc_msgSend)(arg0, arg1, lparg2);
+	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jlong)((jlong (*)(jlong, jlong, jdouble *))objc_msgSend)(arg0, arg1, lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseFloatDoubleArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3F_FUNC);
-#else
+	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3D_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__II_3FIF) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3DJD) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3FIF)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDoubleArray arg2, jintLong arg3, jfloatDouble arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3DJD)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jfloatDoubleArray arg2, jintLong arg3, jfloatDouble arg4)
-#endif
+#ifndef NO_objc_1msgSend__JJ_3DJD
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3DJD)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jdoubleArray arg2, jlong arg3, jdouble arg4)
 {
-	jfloatDouble *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3FIF_FUNC);
-#else
+	jdouble *lparg2=NULL;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3DJD_FUNC);
-#endif
-	if (arg2) if ((lparg2 = (*env)->GetFloatDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jfloatDouble *, jintLong, jfloatDouble))objc_msgSend)(arg0, arg1, lparg2, arg3, arg4);
+	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jlong)((jlong (*)(jlong, jlong, jdouble *, jlong, jdouble))objc_msgSend)(arg0, arg1, lparg2, arg3, arg4);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseFloatDoubleArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3FIF_FUNC);
-#else
+	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3DJD_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__II_3I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2)
-#endif
+#ifndef NO_objc_1msgSend__JJ_3I
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3I)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2)
 {
-	jintLong *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3I_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3J_FUNC);
-#endif
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong *))objc_msgSend)(arg0, arg1, lparg2);
+	jint *lparg2=NULL;
+	jlong rc = 0;
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3I_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jlong)((jlong (*)(jlong, jlong, jint *))objc_msgSend)(arg0, arg1, lparg2);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3I_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3J_FUNC);
-#endif
+	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3I_FUNC);
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__II_3II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3IJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend__JJ_3IJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3IJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2, jlong arg3)
 {
 	jint *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3II_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3IJ_FUNC);
-#endif
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jint *, jintLong))objc_msgSend)(arg0, arg1, lparg2, arg3);
+	rc = (jlong)((jlong (*)(jlong, jlong, jint *, jlong))objc_msgSend)(arg0, arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3IJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__II_3III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3JII) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jint arg3, jint arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3JII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jint arg3, jint arg4)
-#endif
-{
-	jintLong *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3III_FUNC);
-#else
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3JII_FUNC);
-#endif
-	if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jintLong *, jint, jint))objc_msgSend)(arg0, arg1, lparg2, arg3, arg4);
-fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3III_FUNC);
-#else
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3JII_FUNC);
-#endif
-	return rc;
-}
-#endif
-
-#ifndef NO_objc_1msgSend__JJI
-JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJI)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2)
+#ifndef NO_objc_1msgSend__JJ_3J
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3J)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2)
 {
+	jlong *lparg2=NULL;
 	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJI_FUNC);
-	rc = (jlong)((jlong (*)(jlong, jlong, jint))objc_msgSend)(arg0, arg1, arg2);
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJI_FUNC);
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3J_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong *))objc_msgSend)(arg0, arg1, lparg2);
+fail:
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3J_FUNC);
 	return rc;
 }
 #endif
 
-#ifndef NO_objc_1msgSend__JJ_3I
-JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3I)
-	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintArray arg2)
+#ifndef NO_objc_1msgSend__JJ_3JII
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSend__JJ_3JII)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlongArray arg2, jint arg3, jint arg4)
 {
-	jint *lparg2=NULL;
+	jlong *lparg2=NULL;
 	jlong rc = 0;
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3I_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jlong)((jlong (*)(jlong, jlong, jint *))objc_msgSend)(arg0, arg1, lparg2);
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3JII_FUNC);
+	if (arg2) if ((lparg2 = (*env)->GetLongArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	rc = (jlong)((jlong (*)(jlong, jlong, jlong *, jint, jint))objc_msgSend)(arg0, arg1, lparg2, arg3, arg4);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3I_FUNC);
+	if (arg2 && lparg2) (*env)->ReleaseLongArrayElements(env, arg2, lparg2, 0);
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3JII_FUNC);
 	return rc;
 }
 #endif
@@ -8655,1972 +7741,1257 @@ fail:
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1)
 {
 	struct objc_super _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong))objc_msgSendSuper)(lparg0, arg1);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong))objc_msgSendSuper)(lparg0, arg1);
 fail:
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
 {
 	struct objc_super _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, jintLong))objc_msgSendSuper)(lparg0, arg1, arg2);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, jlong))objc_msgSendSuper)(lparg0, arg1, arg2);
 fail:
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2III) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2III)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jlong arg3)
 {
 	struct objc_super _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2III_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, jintLong, jintLong))objc_msgSendSuper)(lparg0, arg1, arg2, arg3);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, jlong, jlong))objc_msgSendSuper)(lparg0, arg1, arg2, arg3);
 fail:
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2III_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIII)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJJ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5)
 {
 	struct objc_super _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIII_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSendSuper)(lparg0, arg1, arg2, arg3, arg4, arg5);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, jlong, jlong, jlong, jlong))objc_msgSendSuper)(lparg0, arg1, arg2, arg3, arg4, arg5);
 fail:
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIII_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jboolean arg5)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jboolean arg5)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jboolean arg5)
 {
 	struct objc_super _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, jintLong, jintLong, jintLong, jboolean))objc_msgSendSuper)(lparg0, arg1, arg2, arg3, arg4, arg5);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, jlong, jlong, jlong, jboolean))objc_msgSendSuper)(lparg0, arg1, arg2, arg3, arg4, arg5);
 fail:
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3)
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSPoint _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, jintLong, NSPoint))objc_msgSendSuper)(lparg0, arg1, arg2, *lparg3);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, jlong, NSPoint))objc_msgSendSuper)(lparg0, arg1, arg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4)
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSPoint _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, jintLong, NSPoint, jintLong))objc_msgSendSuper)(lparg0, arg1, arg2, *lparg3, arg4);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, jlong, NSPoint, jlong))objc_msgSendSuper)(lparg0, arg1, arg2, *lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4)
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSRect _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, jintLong, NSRect, jintLong))objc_msgSendSuper)(lparg0, arg1, arg2, *lparg3, arg4);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, jlong, NSRect, jlong))objc_msgSendSuper)(lparg0, arg1, arg2, *lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jboolean arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jboolean arg3)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJZ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJZ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jboolean arg3)
 {
 	struct objc_super _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIZ_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJZ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, jintLong, jboolean))objc_msgSendSuper)(lparg0, arg1, arg2, arg3);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, jlong, jboolean))objc_msgSendSuper)(lparg0, arg1, arg2, arg3);
 fail:
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIZ_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJZ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jobject arg2)
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSPoint _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, NSPoint))objc_msgSendSuper)(lparg0, arg1, *lparg2);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, NSPoint))objc_msgSendSuper)(lparg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jobject arg2)
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, NSRect))objc_msgSendSuper)(lparg0, arg1, *lparg2);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, NSRect))objc_msgSendSuper)(lparg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2, jintLong arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jobject arg2, jlong arg3)
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSRect _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, NSRect, jintLong))objc_msgSendSuper)(lparg0, arg1, *lparg2, arg3);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, NSRect, jlong))objc_msgSendSuper)(lparg0, arg1, *lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jobject arg2)
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSSize _arg2, *lparg2=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getNSSizeFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, NSSize))objc_msgSendSuper)(lparg0, arg1, *lparg2);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, NSSize))objc_msgSendSuper)(lparg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSSizeFields(env, arg2, lparg2);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jboolean arg2)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jboolean arg2)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jboolean arg2)
 {
 	struct objc_super _arg0, *lparg0=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZ_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, jboolean))objc_msgSendSuper)(lparg0, arg1, arg2);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, jboolean))objc_msgSendSuper)(lparg0, arg1, arg2);
 fail:
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZ_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZLorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jboolean arg2, jobject arg3)
-#else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jboolean arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZLorg_eclipse_swt_internal_cocoa_NSRect_2
+JNIEXPORT jlong JNICALL OS_NATIVE(objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZLorg_eclipse_swt_internal_cocoa_NSRect_2)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jboolean arg2, jobject arg3)
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSRect _arg3, *lparg3=NULL;
-	jintLong rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(struct objc_super *, jintLong, jboolean, NSRect))objc_msgSendSuper)(lparg0, arg1, arg2, *lparg3);
+	rc = (jlong)((jlong (*)(struct objc_super *, jlong, jboolean, NSRect))objc_msgSendSuper)(lparg0, arg1, arg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3)
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSPoint _arg3, *lparg3=NULL;
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jboolean)((jboolean (*)(struct objc_super *, jintLong, jintLong, NSPoint))objc_msgSendSuper_bool)(lparg0, arg1, arg2, *lparg3);
+	rc = (jboolean)((jboolean (*)(struct objc_super *, jlong, jlong, NSPoint))objc_msgSendSuper_bool)(lparg0, arg1, arg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRange_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRange_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRange_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2, jintLong arg3)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRange_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jobject arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRange_2J
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRange_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jobject arg2, jlong arg3)
 {
 	struct objc_super _arg0, *lparg0=NULL;
 	NSRange _arg2, *lparg2=NULL;
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getobjc_superFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg2) if ((lparg2 = getNSRangeFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jboolean)((jboolean (*)(struct objc_super *, jintLong, NSRange, jintLong))objc_msgSendSuper_bool)(lparg0, arg1, *lparg2, arg3);
+	rc = (jboolean)((jboolean (*)(struct objc_super *, jlong, NSRange, jlong))objc_msgSendSuper_bool)(lparg0, arg1, *lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setNSRangeFields(env, arg2, lparg2);
 	if (arg0 && lparg0) setobjc_superFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2II)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ)
+	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jlong arg2, jlong arg3)
 {
 	NSRect _arg0, *lparg0=NULL;
 	struct objc_super _arg1, *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getobjc_superFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, struct objc_super *, jintLong, jintLong))objc_msgSendSuper_stret)(lparg0, lparg1, arg2, arg3);
+		((void (*)(NSRect *, struct objc_super *, jlong, jlong))objc_msgSendSuper_stret)(lparg0, lparg1, arg2, arg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(struct objc_super *, jintLong, jintLong))objc_msgSendSuper_stret)(lparg1, arg2, arg3);
+		*lparg0 = (*(NSRect (*)(struct objc_super *, jlong, jlong))objc_msgSendSuper_stret)(lparg1, arg2, arg3);
 	} else {
-		*lparg0 = (*(NSRect (*)(struct objc_super *, jintLong, jintLong))objc_msgSendSuper)(lparg1, arg2, arg3);
+		*lparg0 = (*(NSRect (*)(struct objc_super *, jlong, jlong))objc_msgSendSuper)(lparg1, arg2, arg3);
 	}
 fail:
 	if (arg1 && lparg1) setobjc_superFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jintLong arg3, jobject arg4, jintLong arg5)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jintLong arg3, jobject arg4, jintLong arg5)
-#endif
+#ifndef NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jlong arg2, jlong arg3, jobject arg4, jlong arg5)
 {
 	NSRect _arg0, *lparg0=NULL;
 	struct objc_super _arg1, *lparg1=NULL;
 	NSRect _arg4, *lparg4=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getobjc_superFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getNSRectFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, struct objc_super *, jintLong, jintLong, NSRect, jintLong))objc_msgSendSuper_stret)(lparg0, lparg1, arg2, arg3, *lparg4, arg5);
+		((void (*)(NSRect *, struct objc_super *, jlong, jlong, NSRect, jlong))objc_msgSendSuper_stret)(lparg0, lparg1, arg2, arg3, *lparg4, arg5);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(struct objc_super *, jintLong, jintLong, NSRect, jintLong))objc_msgSendSuper_stret)(lparg1, arg2, arg3, *lparg4, arg5);
+		*lparg0 = (*(NSRect (*)(struct objc_super *, jlong, jlong, NSRect, jlong))objc_msgSendSuper_stret)(lparg1, arg2, arg3, *lparg4, arg5);
 	} else {
-		*lparg0 = (*(NSRect (*)(struct objc_super *, jintLong, jintLong, NSRect, jintLong))objc_msgSendSuper)(lparg1, arg2, arg3, *lparg4, arg5);
+		*lparg0 = (*(NSRect (*)(struct objc_super *, jlong, jlong, NSRect, jlong))objc_msgSendSuper)(lparg1, arg2, arg3, *lparg4, arg5);
 	}
 fail:
 	if (arg4 && lparg4) setNSRectFields(env, arg4, lparg4);
 	if (arg1 && lparg1) setobjc_superFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2)
+	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jlong arg2, jobject arg3)
 {
 	NSRect _arg0, *lparg0=NULL;
 	struct objc_super _arg1, *lparg1=NULL;
 	NSRect _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getobjc_superFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, struct objc_super *, jintLong, NSRect))objc_msgSendSuper_stret)(lparg0, lparg1, arg2, *lparg3);
+		((void (*)(NSRect *, struct objc_super *, jlong, NSRect))objc_msgSendSuper_stret)(lparg0, lparg1, arg2, *lparg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(struct objc_super *, jintLong, NSRect))objc_msgSendSuper_stret)(lparg1, arg2, *lparg3);
+		*lparg0 = (*(NSRect (*)(struct objc_super *, jlong, NSRect))objc_msgSendSuper_stret)(lparg1, arg2, *lparg3);
 	} else {
-		*lparg0 = (*(NSRect (*)(struct objc_super *, jintLong, NSRect))objc_msgSendSuper)(lparg1, arg2, *lparg3);
+		*lparg0 = (*(NSRect (*)(struct objc_super *, jlong, NSRect))objc_msgSendSuper)(lparg1, arg2, *lparg3);
 	}
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg1 && lparg1) setobjc_superFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2I)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jlong arg2, jobject arg3, jlong arg4)
 {
 	NSRect _arg0, *lparg0=NULL;
 	struct objc_super _arg1, *lparg1=NULL;
 	NSRect _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getobjc_superFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, struct objc_super *, jintLong, NSRect, jintLong))objc_msgSendSuper_stret)(lparg0, lparg1, arg2, *lparg3, arg4);
+		((void (*)(NSRect *, struct objc_super *, jlong, NSRect, jlong))objc_msgSendSuper_stret)(lparg0, lparg1, arg2, *lparg3, arg4);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(struct objc_super *, jintLong, NSRect, jintLong))objc_msgSendSuper_stret)(lparg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSRect (*)(struct objc_super *, jlong, NSRect, jlong))objc_msgSendSuper_stret)(lparg1, arg2, *lparg3, arg4);
 	} else {
-		*lparg0 = (*(NSRect (*)(struct objc_super *, jintLong, NSRect, jintLong))objc_msgSendSuper)(lparg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSRect (*)(struct objc_super *, jlong, NSRect, jlong))objc_msgSendSuper)(lparg1, arg2, *lparg3, arg4);
 	}
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg1 && lparg1) setobjc_superFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2I)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2J)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2)
-#endif
+#ifndef NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2J
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jlong arg2)
 {
 	NSSize _arg0, *lparg0=NULL;
 	struct objc_super _arg1, *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getobjc_superFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSSize *, struct objc_super *, jintLong))objc_msgSendSuper_stret)(lparg0, lparg1, arg2);
+		((void (*)(NSSize *, struct objc_super *, jlong))objc_msgSendSuper_stret)(lparg0, lparg1, arg2);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSSize (*)(struct objc_super *, jintLong))objc_msgSendSuper_stret)(lparg1, arg2);
+		*lparg0 = (*(NSSize (*)(struct objc_super *, jlong))objc_msgSendSuper_stret)(lparg1, arg2);
 	} else {
-		*lparg0 = (*(NSSize (*)(struct objc_super *, jintLong))objc_msgSendSuper)(lparg1, arg2);
+		*lparg0 = (*(NSSize (*)(struct objc_super *, jlong))objc_msgSendSuper)(lparg1, arg2);
 	}
 fail:
 	if (arg1 && lparg1) setobjc_superFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2)
+	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jlong arg2, jobject arg3)
 {
 	NSSize _arg0, *lparg0=NULL;
 	struct objc_super _arg1, *lparg1=NULL;
 	NSRect _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getobjc_superFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSSize *, struct objc_super *, jintLong, NSRect))objc_msgSendSuper_stret)(lparg0, lparg1, arg2, *lparg3);
+		((void (*)(NSSize *, struct objc_super *, jlong, NSRect))objc_msgSendSuper_stret)(lparg0, lparg1, arg2, *lparg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSSize (*)(struct objc_super *, jintLong, NSRect))objc_msgSendSuper_stret)(lparg1, arg2, *lparg3);
+		*lparg0 = (*(NSSize (*)(struct objc_super *, jlong, NSRect))objc_msgSendSuper_stret)(lparg1, arg2, *lparg3);
 	} else {
-		*lparg0 = (*(NSSize (*)(struct objc_super *, jintLong, NSRect))objc_msgSendSuper)(lparg1, arg2, *lparg3);
+		*lparg0 = (*(NSSize (*)(struct objc_super *, jlong, NSRect))objc_msgSendSuper)(lparg1, arg2, *lparg3);
 	}
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg1 && lparg1) setobjc_superFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZ)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jboolean arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ)(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jintLong arg2, jboolean arg3)
-#endif
+#ifndef NO_objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ)
+	(JNIEnv *env, jclass that, jobject arg0, jobject arg1, jlong arg2, jboolean arg3)
 {
 	NSSize _arg0, *lparg0=NULL;
 	struct objc_super _arg1, *lparg1=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZ_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg1) if ((lparg1 = getobjc_superFields(env, arg1, &_arg1)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSSize *, struct objc_super *, jintLong, jboolean))objc_msgSendSuper_stret)(lparg0, lparg1, arg2, arg3);
+		((void (*)(NSSize *, struct objc_super *, jlong, jboolean))objc_msgSendSuper_stret)(lparg0, lparg1, arg2, arg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSSize (*)(struct objc_super *, jintLong, jboolean))objc_msgSendSuper_stret)(lparg1, arg2, arg3);
+		*lparg0 = (*(NSSize (*)(struct objc_super *, jlong, jboolean))objc_msgSendSuper_stret)(lparg1, arg2, arg3);
 	} else {
-		*lparg0 = (*(NSSize (*)(struct objc_super *, jintLong, jboolean))objc_msgSendSuper)(lparg1, arg2, arg3);
+		*lparg0 = (*(NSSize (*)(struct objc_super *, jlong, jboolean))objc_msgSendSuper)(lparg1, arg2, arg3);
 	}
 fail:
 	if (arg1 && lparg1) setobjc_superFields(env, arg1, lparg1);
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZ_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJ
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJ_FUNC);
-#endif
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong))objc_msgSend_bool)(arg0, arg1);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__II_FUNC);
-#else
+	rc = (jboolean)((BOOL (*)(jlong, jlong))objc_msgSend_bool)(arg0, arg1);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJJ
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
 {
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__III_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJJ_FUNC);
-#endif
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong, jintLong))objc_msgSend_bool)(arg0, arg1, arg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__III_FUNC);
-#else
+	rc = (jboolean)((BOOL (*)(jlong, jlong, jlong))objc_msgSend_bool)(arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__IIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJJJ
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3)
 {
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IIII_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJJJ_FUNC);
-#endif
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong, jintLong, jintLong))objc_msgSend_bool)(arg0, arg1, arg2, arg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IIII_FUNC);
-#else
+	rc = (jboolean)((BOOL (*)(jlong, jlong, jlong, jlong))objc_msgSend_bool)(arg0, arg1, arg2, arg3);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__IIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJJJJ
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4)
 {
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IIIII_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJJJJ_FUNC);
-#endif
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend_bool)(arg0, arg1, arg2, arg3, arg4);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IIIII_FUNC);
-#else
+	rc = (jboolean)((BOOL (*)(jlong, jlong, jlong, jlong, jlong))objc_msgSend_bool)(arg0, arg1, arg2, arg3, arg4);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__IIIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJJJJJ
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5)
 {
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IIIIII_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJJJJJ_FUNC);
-#endif
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend_bool)(arg0, arg1, arg2, arg3, arg4, arg5);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IIIIII_FUNC);
-#else
+	rc = (jboolean)((BOOL (*)(jlong, jlong, jlong, jlong, jlong, jlong))objc_msgSend_bool)(arg0, arg1, arg2, arg3, arg4, arg5);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJJJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__IIIIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJJJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IIIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJJJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5, jintLong arg6)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJJJJJJ
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJJJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5, jlong arg6)
 {
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IIIIIII_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJJJJJJ_FUNC);
-#endif
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend_bool)(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IIIIIII_FUNC);
-#else
+	rc = (jboolean)((BOOL (*)(jlong, jlong, jlong, jlong, jlong, jlong, jlong))objc_msgSend_bool)(arg0, arg1, arg2, arg3, arg4, arg5, arg6);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJJJJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3)
 {
 	NSPoint _arg3, *lparg3=NULL;
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong, jintLong, NSPoint))objc_msgSend_bool)(arg0, arg1, arg2, *lparg3);
+	rc = (jboolean)((BOOL (*)(jlong, jlong, jlong, NSPoint))objc_msgSend_bool)(arg0, arg1, arg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__IIILorg_eclipse_swt_internal_cocoa_NSSize_2Z) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSSize_2Z) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IIILorg_eclipse_swt_internal_cocoa_NSSize_2Z)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jboolean arg4)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSSize_2Z)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jobject arg3, jboolean arg4)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSSize_2Z
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSSize_2Z)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jobject arg3, jboolean arg4)
 {
 	NSSize _arg3, *lparg3=NULL;
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IIILorg_eclipse_swt_internal_cocoa_NSSize_2Z_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSSize_2Z_FUNC);
-#endif
 	if (arg3) if ((lparg3 = getNSSizeFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong, jintLong, NSSize, jboolean))objc_msgSend_bool)(arg0, arg1, arg2, *lparg3, arg4);
+	rc = (jboolean)((BOOL (*)(jlong, jlong, jlong, NSSize, jboolean))objc_msgSend_bool)(arg0, arg1, arg2, *lparg3, arg4);
 fail:
 	if (arg3 && lparg3) setNSSizeFields(env, arg3, lparg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IIILorg_eclipse_swt_internal_cocoa_NSSize_2Z_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSSize_2Z_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2)
 {
 	NSPoint _arg2, *lparg2=NULL;
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong, NSPoint))objc_msgSend_bool)(arg0, arg1, *lparg2);
+	rc = (jboolean)((BOOL (*)(jlong, jlong, NSPoint))objc_msgSend_bool)(arg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jobject arg3)
 {
 	NSPoint _arg2, *lparg2=NULL;
 	NSRect _arg3, *lparg3=NULL;
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSPointFields(env, arg2, &_arg2)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong, NSPoint, NSRect))objc_msgSend_bool)(arg0, arg1, *lparg2, *lparg3);
+	rc = (jboolean)((BOOL (*)(jlong, jlong, NSPoint, NSRect))objc_msgSend_bool)(arg0, arg1, *lparg2, *lparg3);
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg2 && lparg2) setNSPointFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSRange_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSRange_2I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2, jlong arg3)
 {
 	NSRange _arg2, *lparg2=NULL;
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRangeFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong, NSRange, jintLong))objc_msgSend_bool)(arg0, arg1, *lparg2, arg3);
+	rc = (jboolean)((BOOL (*)(jlong, jlong, NSRange, jlong))objc_msgSend_bool)(arg0, arg1, *lparg2, arg3);
 fail:
 	if (arg2 && lparg2) setNSRangeFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jobject arg2)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRect_2
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRect_2)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jobject arg2)
 {
 	NSRect _arg2, *lparg2=NULL;
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	if (arg2) if ((lparg2 = getNSRectFields(env, arg2, &_arg2)) == NULL) goto fail;
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong, NSRect))objc_msgSend_bool)(arg0, arg1, *lparg2);
+	rc = (jboolean)((BOOL (*)(jlong, jlong, NSRect))objc_msgSend_bool)(arg0, arg1, *lparg2);
 fail:
 	if (arg2 && lparg2) setNSRectFields(env, arg2, lparg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1bool__IIS) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1bool__JJS) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__IIS)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jshort arg2)
-#else
-JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJS)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jshort arg2)
-#endif
+#ifndef NO_objc_1msgSend_1bool__JJS
+JNIEXPORT jboolean JNICALL OS_NATIVE(objc_1msgSend_1bool__JJS)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jshort arg2)
 {
 	jboolean rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__IIS_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1bool__JJS_FUNC);
-#endif
-	rc = (jboolean)((BOOL (*)(jintLong, jintLong, jshort))objc_msgSend_bool)(arg0, arg1, arg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__IIS_FUNC);
-#else
+	rc = (jboolean)((BOOL (*)(jlong, jlong, jshort))objc_msgSend_bool)(arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1bool__JJS_FUNC);
-#endif
 	return rc;
 }
 #endif
 
 #ifndef NO_objc_1msgSend_1floatret
 JNIEXPORT jfloat JNICALL OS_NATIVE(objc_1msgSend_1floatret)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
 	jfloat rc = 0;
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1floatret_FUNC);
-	rc = (jfloat)((jfloat (*)(jintLong, jintLong))objc_msgSend_floatret)(arg0, arg1);
+	rc = (jfloat)((jfloat (*)(jlong, jlong))objc_msgSend_floatret)(arg0, arg1);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1floatret_FUNC);
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1fpret__II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1fpret__JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-#else
-JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__JJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
-#endif
+#ifndef NO_objc_1msgSend_1fpret__JJ
+JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__JJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
 	jdouble rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1fpret__II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1fpret__JJ_FUNC);
-#endif
-	rc = (jdouble)((jdouble (*)(jintLong, jintLong))objc_msgSend_fpret)(arg0, arg1);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1fpret__II_FUNC);
-#else
+	rc = (jdouble)((jdouble (*)(jlong, jlong))objc_msgSend_fpret)(arg0, arg1);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1fpret__JJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1fpret__III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1fpret__JJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__III)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__JJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_objc_1msgSend_1fpret__JJJ
+JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__JJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
 {
 	jdouble rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1fpret__III_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1fpret__JJJ_FUNC);
-#endif
-	rc = (jdouble)((jdouble (*)(jintLong, jintLong, jintLong))objc_msgSend_fpret)(arg0, arg1, arg2);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1fpret__III_FUNC);
-#else
+	rc = (jdouble)((jdouble (*)(jlong, jlong, jlong))objc_msgSend_fpret)(arg0, arg1, arg2);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1fpret__JJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1fpret__IIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1fpret__JJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__IIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#else
-JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__JJJJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend_1fpret__JJJJ
+JNIEXPORT jdouble JNICALL OS_NATIVE(objc_1msgSend_1fpret__JJJJ)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3)
 {
 	jdouble rc = 0;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1fpret__IIII_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1fpret__JJJJ_FUNC);
-#endif
-	rc = (jdouble)((jdouble (*)(jintLong, jintLong, jintLong, jintLong))objc_msgSend_fpret)(arg0, arg1, arg2, arg3);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1fpret__IIII_FUNC);
-#else
+	rc = (jdouble)((jdouble (*)(jlong, jlong, jlong, jlong))objc_msgSend_fpret)(arg0, arg1, arg2, arg3);
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1fpret__JJJJ_FUNC);
-#endif
 	return rc;
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
 {
 	NSAffineTransformStruct _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSAffineTransformStructFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSAffineTransformStruct *, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2);
+		((void (*)(NSAffineTransformStruct *, jlong, jlong))objc_msgSend_stret)(lparg0, arg1, arg2);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSAffineTransformStruct (*)(jintLong, jintLong))objc_msgSend_stret)(arg1, arg2);
+		*lparg0 = (*(NSAffineTransformStruct (*)(jlong, jlong))objc_msgSend_stret)(arg1, arg2);
 	} else {
-		*lparg0 = (*(NSAffineTransformStruct (*)(jintLong, jintLong))objc_msgSend)(arg1, arg2);
+		*lparg0 = (*(NSAffineTransformStruct (*)(jlong, jlong))objc_msgSend)(arg1, arg2);
 	}
 fail:
 	if (arg0 && lparg0) setNSAffineTransformStructFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
 {
 	NSPoint _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSPointFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSPoint *, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2);
+		((void (*)(NSPoint *, jlong, jlong))objc_msgSend_stret)(lparg0, arg1, arg2);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSPoint (*)(jintLong, jintLong))objc_msgSend_stret)(arg1, arg2);
+		*lparg0 = (*(NSPoint (*)(jlong, jlong))objc_msgSend_stret)(arg1, arg2);
 	} else {
-		*lparg0 = (*(NSPoint (*)(jintLong, jintLong))objc_msgSend)(arg1, arg2);
+		*lparg0 = (*(NSPoint (*)(jlong, jlong))objc_msgSend)(arg1, arg2);
 	}
 fail:
 	if (arg0 && lparg0) setNSPointFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jlong arg3)
 {
 	NSPoint _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSPointFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSPoint *, jintLong, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3);
+		((void (*)(NSPoint *, jlong, jlong, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSPoint (*)(jintLong, jintLong, jintLong))objc_msgSend_stret)(arg1, arg2, arg3);
+		*lparg0 = (*(NSPoint (*)(jlong, jlong, jlong))objc_msgSend_stret)(arg1, arg2, arg3);
 	} else {
-		*lparg0 = (*(NSPoint (*)(jintLong, jintLong, jintLong))objc_msgSend)(arg1, arg2, arg3);
+		*lparg0 = (*(NSPoint (*)(jlong, jlong, jlong))objc_msgSend)(arg1, arg2, arg3);
 	}
 fail:
 	if (arg0 && lparg0) setNSPointFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3)
 {
 	NSPoint _arg0, *lparg0=NULL;
 	NSPoint _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSPointFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSPoint *, jintLong, jintLong, NSPoint))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
+		((void (*)(NSPoint *, jlong, jlong, NSPoint))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSPoint (*)(jintLong, jintLong, NSPoint))objc_msgSend_stret)(arg1, arg2, *lparg3);
+		*lparg0 = (*(NSPoint (*)(jlong, jlong, NSPoint))objc_msgSend_stret)(arg1, arg2, *lparg3);
 	} else {
-		*lparg0 = (*(NSPoint (*)(jintLong, jintLong, NSPoint))objc_msgSend)(arg1, arg2, *lparg3);
+		*lparg0 = (*(NSPoint (*)(jlong, jlong, NSPoint))objc_msgSend)(arg1, arg2, *lparg3);
 	}
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSPointFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4)
 {
 	NSPoint _arg0, *lparg0=NULL;
 	NSPoint _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSPointFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSPointFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSPoint *, jintLong, jintLong, NSPoint, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
+		((void (*)(NSPoint *, jlong, jlong, NSPoint, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSPoint (*)(jintLong, jintLong, NSPoint, jintLong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSPoint (*)(jlong, jlong, NSPoint, jlong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4);
 	} else {
-		*lparg0 = (*(NSPoint (*)(jintLong, jintLong, NSPoint, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSPoint (*)(jlong, jlong, NSPoint, jlong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
 	}
 fail:
 	if (arg3 && lparg3) setNSPointFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSPointFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
 {
 	NSRange _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRangeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRange *, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2);
+		((void (*)(NSRange *, jlong, jlong))objc_msgSend_stret)(lparg0, arg1, arg2);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRange (*)(jintLong, jintLong))objc_msgSend_stret)(arg1, arg2);
+		*lparg0 = (*(NSRange (*)(jlong, jlong))objc_msgSend_stret)(arg1, arg2);
 	} else {
-		*lparg0 = (*(NSRange (*)(jintLong, jintLong))objc_msgSend)(arg1, arg2);
+		*lparg0 = (*(NSRange (*)(jlong, jlong))objc_msgSend)(arg1, arg2);
 	}
 fail:
 	if (arg0 && lparg0) setNSRangeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jlong arg3)
 {
 	NSRange _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRangeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRange *, jintLong, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3);
+		((void (*)(NSRange *, jlong, jlong, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRange (*)(jintLong, jintLong, jintLong))objc_msgSend_stret)(arg1, arg2, arg3);
+		*lparg0 = (*(NSRange (*)(jlong, jlong, jlong))objc_msgSend_stret)(arg1, arg2, arg3);
 	} else {
-		*lparg0 = (*(NSRange (*)(jintLong, jintLong, jintLong))objc_msgSend)(arg1, arg2, arg3);
+		*lparg0 = (*(NSRange (*)(jlong, jlong, jlong))objc_msgSend)(arg1, arg2, arg3);
 	}
 fail:
 	if (arg0 && lparg0) setNSRangeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4)
 {
 	NSRange _arg0, *lparg0=NULL;
 	NSRange _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRangeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRangeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRange *, jintLong, jintLong, NSRange, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
+		((void (*)(NSRange *, jlong, jlong, NSRange, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRange (*)(jintLong, jintLong, NSRange, jintLong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSRange (*)(jlong, jlong, NSRange, jlong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4);
 	} else {
-		*lparg0 = (*(NSRange (*)(jintLong, jintLong, NSRange, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSRange (*)(jlong, jlong, NSRange, jlong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
 	}
 fail:
 	if (arg3 && lparg3) setNSRangeFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSRangeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2IILorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2IILorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3)
 {
 	NSRange _arg0, *lparg0=NULL;
 	NSRect _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRangeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRange *, jintLong, jintLong, NSRect))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
+		((void (*)(NSRange *, jlong, jlong, NSRect))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRange (*)(jintLong, jintLong, NSRect))objc_msgSend_stret)(arg1, arg2, *lparg3);
+		*lparg0 = (*(NSRange (*)(jlong, jlong, NSRect))objc_msgSend_stret)(arg1, arg2, *lparg3);
 	} else {
-		*lparg0 = (*(NSRange (*)(jintLong, jintLong, NSRect))objc_msgSend)(arg1, arg2, *lparg3);
+		*lparg0 = (*(NSRange (*)(jlong, jlong, NSRect))objc_msgSend)(arg1, arg2, *lparg3);
 	}
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSRangeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
 {
 	NSRect _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2);
+		((void (*)(NSRect *, jlong, jlong))objc_msgSend_stret)(lparg0, arg1, arg2);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong))objc_msgSend_stret)(arg1, arg2);
+		*lparg0 = (*(NSRect (*)(jlong, jlong))objc_msgSend_stret)(arg1, arg2);
 	} else {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong))objc_msgSend)(arg1, arg2);
+		*lparg0 = (*(NSRect (*)(jlong, jlong))objc_msgSend)(arg1, arg2);
 	}
 fail:
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jlong arg3)
 {
 	NSRect _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, jintLong, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3);
+		((void (*)(NSRect *, jlong, jlong, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, jintLong))objc_msgSend_stret)(arg1, arg2, arg3);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, jlong))objc_msgSend_stret)(arg1, arg2, arg3);
 	} else {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, jintLong))objc_msgSend)(arg1, arg2, arg3);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, jlong))objc_msgSend)(arg1, arg2, arg3);
 	}
 fail:
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4)
 {
 	NSRect _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, jintLong, jintLong, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3, arg4);
+		((void (*)(NSRect *, jlong, jlong, jlong, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3, arg4);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, jintLong, jintLong))objc_msgSend_stret)(arg1, arg2, arg3, arg4);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, jlong, jlong))objc_msgSend_stret)(arg1, arg2, arg3, arg4);
 	} else {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg1, arg2, arg3, arg4);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, jlong, jlong))objc_msgSend)(arg1, arg2, arg3, arg4);
 	}
 fail:
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jboolean arg5)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jboolean arg5)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jboolean arg5)
 {
 	NSRect _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, jintLong, jintLong, jintLong, jintLong, jboolean))objc_msgSend_stret)(lparg0, arg1, arg2, arg3, arg4, arg5);
+		((void (*)(NSRect *, jlong, jlong, jlong, jlong, jboolean))objc_msgSend_stret)(lparg0, arg1, arg2, arg3, arg4, arg5);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, jintLong, jintLong, jboolean))objc_msgSend_stret)(arg1, arg2, arg3, arg4, arg5);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, jlong, jlong, jboolean))objc_msgSend_stret)(arg1, arg2, arg3, arg4, arg5);
 	} else {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, jintLong, jintLong, jboolean))objc_msgSend)(arg1, arg2, arg3, arg4, arg5);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, jlong, jlong, jboolean))objc_msgSend)(arg1, arg2, arg3, arg4, arg5);
 	}
 fail:
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIILorg_eclipse_swt_internal_cocoa_NSRect_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIILorg_eclipse_swt_internal_cocoa_NSRect_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4, jintLong arg5)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jintLong arg3, jobject arg4, jintLong arg5)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jlong arg3, jobject arg4, jlong arg5)
 {
 	NSRect _arg0, *lparg0=NULL;
 	NSRect _arg4, *lparg4=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg4) if ((lparg4 = getNSRectFields(env, arg4, &_arg4)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, jintLong, jintLong, jintLong, NSRect, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3, *lparg4, arg5);
+		((void (*)(NSRect *, jlong, jlong, jlong, NSRect, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, arg3, *lparg4, arg5);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, jintLong, NSRect, jintLong))objc_msgSend_stret)(arg1, arg2, arg3, *lparg4, arg5);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, jlong, NSRect, jlong))objc_msgSend_stret)(arg1, arg2, arg3, *lparg4, arg5);
 	} else {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, jintLong, NSRect, jintLong))objc_msgSend)(arg1, arg2, arg3, *lparg4, arg5);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, jlong, NSRect, jlong))objc_msgSend)(arg1, arg2, arg3, *lparg4, arg5);
 	}
 fail:
 	if (arg4 && lparg4) setNSRectFields(env, arg4, lparg4);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4)
 {
 	NSRect _arg0, *lparg0=NULL;
 	NSRange _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRangeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, jintLong, jintLong, NSRange, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
+		((void (*)(NSRect *, jlong, jlong, NSRange, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, NSRange, jintLong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, NSRange, jlong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4);
 	} else {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, NSRange, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, NSRange, jlong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
 	}
 fail:
 	if (arg3 && lparg3) setNSRangeFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3)
 {
 	NSRect _arg0, *lparg0=NULL;
 	NSRect _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, jintLong, jintLong, NSRect))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
+		((void (*)(NSRect *, jlong, jlong, NSRect))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, NSRect))objc_msgSend_stret)(arg1, arg2, *lparg3);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, NSRect))objc_msgSend_stret)(arg1, arg2, *lparg3);
 	} else {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, NSRect))objc_msgSend)(arg1, arg2, *lparg3);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, NSRect))objc_msgSend)(arg1, arg2, *lparg3);
 	}
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4)
 {
 	NSRect _arg0, *lparg0=NULL;
 	NSRect _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, jintLong, jintLong, NSRect, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
+		((void (*)(NSRect *, jlong, jlong, NSRect, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, NSRect, jintLong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, NSRect, jlong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4);
 	} else {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, NSRect, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, NSRect, jlong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
 	}
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4)
 {
 	NSRect _arg0, *lparg0=NULL;
 	NSSize _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSRectFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSSizeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSRect *, jintLong, jintLong, NSSize, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
+		((void (*)(NSRect *, jlong, jlong, NSSize, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, NSSize, jintLong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, NSSize, jlong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4);
 	} else {
-		*lparg0 = (*(NSRect (*)(jintLong, jintLong, NSSize, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSRect (*)(jlong, jlong, NSSize, jlong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
 	}
 fail:
 	if (arg3 && lparg3) setNSSizeFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSRectFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2)
 {
 	NSSize _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSSize *, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2);
+		((void (*)(NSSize *, jlong, jlong))objc_msgSend_stret)(lparg0, arg1, arg2);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong))objc_msgSend_stret)(arg1, arg2);
+		*lparg0 = (*(NSSize (*)(jlong, jlong))objc_msgSend_stret)(arg1, arg2);
 	} else {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong))objc_msgSend)(arg1, arg2);
+		*lparg0 = (*(NSSize (*)(jlong, jlong))objc_msgSend)(arg1, arg2);
 	}
 fail:
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSRect_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3)
 {
 	NSSize _arg0, *lparg0=NULL;
 	NSRect _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSRectFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSSize *, jintLong, jintLong, NSRect))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
+		((void (*)(NSSize *, jlong, jlong, NSRect))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSRect))objc_msgSend_stret)(arg1, arg2, *lparg3);
+		*lparg0 = (*(NSSize (*)(jlong, jlong, NSRect))objc_msgSend_stret)(arg1, arg2, *lparg3);
 	} else {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSRect))objc_msgSend)(arg1, arg2, *lparg3);
+		*lparg0 = (*(NSSize (*)(jlong, jlong, NSRect))objc_msgSend)(arg1, arg2, *lparg3);
 	}
 fail:
 	if (arg3 && lparg3) setNSRectFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3)
 {
 	NSSize _arg0, *lparg0=NULL;
 	NSSize _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSSizeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSSize *, jintLong, jintLong, NSSize))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
+		((void (*)(NSSize *, jlong, jlong, NSSize))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSSize))objc_msgSend_stret)(arg1, arg2, *lparg3);
+		*lparg0 = (*(NSSize (*)(jlong, jlong, NSSize))objc_msgSend_stret)(arg1, arg2, *lparg3);
 	} else {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSSize))objc_msgSend)(arg1, arg2, *lparg3);
+		*lparg0 = (*(NSSize (*)(jlong, jlong, NSSize))objc_msgSend)(arg1, arg2, *lparg3);
 	}
 fail:
 	if (arg3 && lparg3) setNSSizeFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4)
 {
 	NSSize _arg0, *lparg0=NULL;
 	NSSize _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSSizeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSSize *, jintLong, jintLong, NSSize, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
+		((void (*)(NSSize *, jlong, jlong, NSSize, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSSize, jintLong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSSize (*)(jlong, jlong, NSSize, jlong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4);
 	} else {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSSize, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
+		*lparg0 = (*(NSSize (*)(jlong, jlong, NSSize, jlong))objc_msgSend)(arg1, arg2, *lparg3, arg4);
 	}
 fail:
 	if (arg3 && lparg3) setNSSizeFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2IIIII) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2JJJJJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2IIIII)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7, jintLong arg8)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2JJJJJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jintLong arg4, jintLong arg5, jintLong arg6, jintLong arg7, jintLong arg8)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2JJJJJ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2JJJJJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3, jlong arg4, jlong arg5, jlong arg6, jlong arg7, jlong arg8)
 {
 	NSSize _arg0, *lparg0=NULL;
 	NSSize _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2IIIII_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2JJJJJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSSizeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSSize *, jintLong, jintLong, NSSize, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4, arg5, arg6, arg7, arg8);
+		((void (*)(NSSize *, jlong, jlong, NSSize, jlong, jlong, jlong, jlong, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4, arg5, arg6, arg7, arg8);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSSize, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4, arg5, arg6, arg7, arg8);
+		*lparg0 = (*(NSSize (*)(jlong, jlong, NSSize, jlong, jlong, jlong, jlong, jlong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4, arg5, arg6, arg7, arg8);
 	} else {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSSize, jintLong, jintLong, jintLong, jintLong, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4, arg5, arg6, arg7, arg8);
+		*lparg0 = (*(NSSize (*)(jlong, jlong, NSSize, jlong, jlong, jlong, jlong, jlong))objc_msgSend)(arg1, arg2, *lparg3, arg4, arg5, arg6, arg7, arg8);
 	}
 fail:
 	if (arg3 && lparg3) setNSSizeFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2IIIII_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2JJJJJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jboolean arg4, jboolean arg5, jintLong arg6)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jobject arg3, jboolean arg4, jboolean arg5, jintLong arg6)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jobject arg3, jboolean arg4, jboolean arg5, jlong arg6)
 {
 	NSSize _arg0, *lparg0=NULL;
 	NSSize _arg3, *lparg3=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (arg3) if ((lparg3 = getNSSizeFields(env, arg3, &_arg3)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSSize *, jintLong, jintLong, NSSize, jboolean, jboolean, jintLong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4, arg5, arg6);
+		((void (*)(NSSize *, jlong, jlong, NSSize, jboolean, jboolean, jlong))objc_msgSend_stret)(lparg0, arg1, arg2, *lparg3, arg4, arg5, arg6);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSSize, jboolean, jboolean, jintLong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4, arg5, arg6);
+		*lparg0 = (*(NSSize (*)(jlong, jlong, NSSize, jboolean, jboolean, jlong))objc_msgSend_stret)(arg1, arg2, *lparg3, arg4, arg5, arg6);
 	} else {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong, NSSize, jboolean, jboolean, jintLong))objc_msgSend)(arg1, arg2, *lparg3, arg4, arg5, arg6);
+		*lparg0 = (*(NSSize (*)(jlong, jlong, NSSize, jboolean, jboolean, jlong))objc_msgSend)(arg1, arg2, *lparg3, arg4, arg5, arg6);
 	}
 fail:
 	if (arg3 && lparg3) setNSSizeFields(env, arg3, lparg3);
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ_FUNC);
-#endif
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IIZ) && !defined(JNI64)) || (!defined(NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJZ) && defined(JNI64))
-#ifndef JNI64
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IIZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jboolean arg3)
-#else
-JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJZ)(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jintLong arg2, jboolean arg3)
-#endif
+#ifndef NO_objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJZ
+JNIEXPORT void JNICALL OS_NATIVE(objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJZ)
+	(JNIEnv *env, jclass that, jobject arg0, jlong arg1, jlong arg2, jboolean arg3)
 {
 	NSSize _arg0, *lparg0=NULL;
-#ifndef JNI64
-	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IIZ_FUNC);
-#else
 	OS_NATIVE_ENTER(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJZ_FUNC);
-#endif
 	if (arg0) if ((lparg0 = getNSSizeFields(env, arg0, &_arg0)) == NULL) goto fail;
 	if (STRUCT_SIZE_LIMIT == 0) {
-		((void (*)(NSSize *, jintLong, jintLong, jboolean))objc_msgSend_stret)(lparg0, arg1, arg2, arg3);
+		((void (*)(NSSize *, jlong, jlong, jboolean))objc_msgSend_stret)(lparg0, arg1, arg2, arg3);
 	} else if (sizeof(_arg0) > STRUCT_SIZE_LIMIT) {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong, jboolean))objc_msgSend_stret)(arg1, arg2, arg3);
+		*lparg0 = (*(NSSize (*)(jlong, jlong, jboolean))objc_msgSend_stret)(arg1, arg2, arg3);
 	} else {
-		*lparg0 = (*(NSSize (*)(jintLong, jintLong, jboolean))objc_msgSend)(arg1, arg2, arg3);
+		*lparg0 = (*(NSSize (*)(jlong, jlong, jboolean))objc_msgSend)(arg1, arg2, arg3);
 	}
 fail:
 	if (arg0 && lparg0) setNSSizeFields(env, arg0, lparg0);
-#ifndef JNI64
-	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IIZ_FUNC);
-#else
 	OS_NATIVE_EXIT(env, that, objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJZ_FUNC);
-#endif
 }
 #endif
 
 #ifndef NO_objc_1registerClassPair
 JNIEXPORT void JNICALL OS_NATIVE(objc_1registerClassPair)
-	(JNIEnv *env, jclass that, jintLong arg0)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
 	OS_NATIVE_ENTER(env, that, objc_1registerClassPair_FUNC);
 	objc_registerClassPair((Class)arg0);
@@ -10641,40 +9012,40 @@ JNIEXPORT jint JNICALL OS_NATIVE(objc_1super_1sizeof)
 #endif
 
 #ifndef NO_object_1getClass
-JNIEXPORT jintLong JNICALL OS_NATIVE(object_1getClass)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(object_1getClass)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, object_1getClass_FUNC);
-	rc = (jintLong)object_getClass((id)arg0);
+	rc = (jlong)object_getClass((id)arg0);
 	OS_NATIVE_EXIT(env, that, object_1getClass_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_object_1getClassName
-JNIEXPORT jintLong JNICALL OS_NATIVE(object_1getClassName)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(object_1getClassName)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, object_1getClassName_FUNC);
-	rc = (jintLong)object_getClassName((id)arg0);
+	rc = (jlong)object_getClassName((id)arg0);
 	OS_NATIVE_EXIT(env, that, object_1getClassName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_object_1getInstanceVariable
-JNIEXPORT jintLong JNICALL OS_NATIVE(object_1getInstanceVariable)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLongArray arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(object_1getInstanceVariable)
+	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlongArray arg2)
 {
 	jbyte *lparg1=NULL;
-	jintLong *lparg2=NULL;
-	jintLong rc = 0;
+	jlong *lparg2=NULL;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, object_1getInstanceVariable_FUNC);
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
 		if (arg2) if ((lparg2 = (*env)->GetPrimitiveArrayCritical(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)object_getInstanceVariable((id)arg0, (const char*)lparg1, (void **)lparg2);
+	rc = (jlong)object_getInstanceVariable((id)arg0, (const char*)lparg1, (void **)lparg2);
 fail:
 		if (arg2 && lparg2) (*env)->ReleasePrimitiveArrayCritical(env, arg2, lparg2, 0);
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, 0);
@@ -10684,26 +9055,26 @@ fail:
 #endif
 
 #ifndef NO_object_1setClass
-JNIEXPORT jintLong JNICALL OS_NATIVE(object_1setClass)
-	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+JNIEXPORT jlong JNICALL OS_NATIVE(object_1setClass)
+	(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, object_1setClass_FUNC);
-	rc = (jintLong)object_setClass((id)arg0, (Class)arg1);
+	rc = (jlong)object_setClass((id)arg0, (Class)arg1);
 	OS_NATIVE_EXIT(env, that, object_1setClass_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_object_1setInstanceVariable
-JNIEXPORT jintLong JNICALL OS_NATIVE(object_1setInstanceVariable)
-	(JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2)
+JNIEXPORT jlong JNICALL OS_NATIVE(object_1setInstanceVariable)
+	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2)
 {
 	jbyte *lparg1=NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, object_1setInstanceVariable_FUNC);
 		if (arg1) if ((lparg1 = (*env)->GetPrimitiveArrayCritical(env, arg1, NULL)) == NULL) goto fail;
-	rc = (jintLong)object_setInstanceVariable((id)arg0, (const char*)lparg1, (void *)arg2);
+	rc = (jlong)object_setInstanceVariable((id)arg0, (const char*)lparg1, (void *)arg2);
 fail:
 		if (arg1 && lparg1) (*env)->ReleasePrimitiveArrayCritical(env, arg1, lparg1, 0);
 	OS_NATIVE_EXIT(env, that, object_1setInstanceVariable_FUNC);
@@ -10712,26 +9083,26 @@ fail:
 #endif
 
 #ifndef NO_sel_1getName
-JNIEXPORT jintLong JNICALL OS_NATIVE(sel_1getName)
-	(JNIEnv *env, jclass that, jintLong arg0)
+JNIEXPORT jlong JNICALL OS_NATIVE(sel_1getName)
+	(JNIEnv *env, jclass that, jlong arg0)
 {
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, sel_1getName_FUNC);
-	rc = (jintLong)sel_getName((SEL)arg0);
+	rc = (jlong)sel_getName((SEL)arg0);
 	OS_NATIVE_EXIT(env, that, sel_1getName_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_sel_1registerName
-JNIEXPORT jintLong JNICALL OS_NATIVE(sel_1registerName)
+JNIEXPORT jlong JNICALL OS_NATIVE(sel_1registerName)
 	(JNIEnv *env, jclass that, jstring arg0)
 {
 	const char *lparg0= NULL;
-	jintLong rc = 0;
+	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, sel_1registerName_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetStringUTFChars(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jintLong)sel_registerName(lparg0);
+	rc = (jlong)sel_registerName(lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseStringUTFChars(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, sel_1registerName_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
index 1707f2764a..b712b271da 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
@@ -476,56 +476,16 @@ char * OS_nativeFunctionNames[] = {
 	"kTISPropertyUnicodeKeyLayoutData",
 	"kUTTypeFileURL",
 	"kUTTypeURL",
-#ifndef JNI64
-	"memmove__ILorg_eclipse_swt_internal_cocoa_CGPathElement_2I",
-#else
 	"memmove__JLorg_eclipse_swt_internal_cocoa_CGPathElement_2J",
-#endif
-#ifndef JNI64
-	"memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I",
-#else
 	"memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J",
-#endif
-#ifndef JNI64
-	"memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I",
-#else
 	"memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J",
-#endif
-#ifndef JNI64
-	"memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I",
-#else
 	"memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J",
-#endif
-#ifndef JNI64
-	"memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I",
-#else
 	"memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J",
-#endif
-#ifndef JNI64
-	"memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2II",
-#else
 	"memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2JJ",
-#endif
-#ifndef JNI64
-	"memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II",
-#else
 	"memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ",
-#endif
-#ifndef JNI64
-	"memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II",
-#else
 	"memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ",
-#endif
-#ifndef JNI64
-	"memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II",
-#else
 	"memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ",
-#endif
-#ifndef JNI64
-	"memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II",
-#else
 	"memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ",
-#endif
 	"method_1setImplementation",
 	"objc_1allocateClassPair",
 	"objc_1disposeClassPair",
@@ -533,696 +493,147 @@ char * OS_nativeFunctionNames[] = {
 	"objc_1getMetaClass",
 	"objc_1getProtocol",
 	"objc_1lookUpClass",
-#ifndef JNI64
-	"objc_1msgSend__II",
-#else
 	"objc_1msgSend__JJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IID",
-#else
 	"objc_1msgSend__JJD",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIDIIIZ",
-#else
-	"objc_1msgSend__JJDJJJZ",
-#endif
-	"objc_1msgSend__IIF",
-#ifndef JNI64
-	"objc_1msgSend__IIFF",
-#else
 	"objc_1msgSend__JJDD",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIFFFF",
-#else
 	"objc_1msgSend__JJDDDD",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIFI",
-#else
 	"objc_1msgSend__JJDJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__III",
-#else
+	"objc_1msgSend__JJDJJJZ",
+	"objc_1msgSend__JJI",
 	"objc_1msgSend__JJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIF",
-#else
 	"objc_1msgSend__JJJD",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIII",
-#else
 	"objc_1msgSend__JJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIIDI",
-#else
 	"objc_1msgSend__JJJJDJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIII",
-#else
 	"objc_1msgSend__JJJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIIIF",
-#else
 	"objc_1msgSend__JJJJJD",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIIII",
-#else
 	"objc_1msgSend__JJJJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIIIII",
-#else
 	"objc_1msgSend__JJJJJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIIIIII",
-#else
 	"objc_1msgSend__JJJJJJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIIIIIII",
-#else
 	"objc_1msgSend__JJJJJJJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIIIIIZZIII",
-#else
 	"objc_1msgSend__JJJJJJJZZJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIIIIIZZIIII",
-#else
 	"objc_1msgSend__JJJJJJJZZJJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIIIZ",
-#else
 	"objc_1msgSend__JJJJJZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2",
-#else
 	"objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIIZ",
-#else
 	"objc_1msgSend__JJJJZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#else
 	"objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2I",
-#else
 	"objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIIIII",
-#else
 	"objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII",
-#else
 	"objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2IIIZ",
-#else
 	"objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2JJJZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2",
-#else
 	"objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRect_2I",
-#else
 	"objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIIZ",
-#else
 	"objc_1msgSend__JJJZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2IIII_3B",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2JJJJ_3B",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2I_3I",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2J_3J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2III",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2ZZ",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2ZZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2",
-#else
 	"objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIZ",
-#else
 	"objc_1msgSend__JJZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIZI",
-#else
 	"objc_1msgSend__JJZJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__IIZLorg_eclipse_swt_internal_cocoa_NSRect_2",
-#else
 	"objc_1msgSend__JJZLorg_eclipse_swt_internal_cocoa_NSRect_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__II_3B",
-#else
 	"objc_1msgSend__JJ_3B",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__II_3BI",
-#else
 	"objc_1msgSend__JJ_3BJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__II_3C",
-#else
 	"objc_1msgSend__JJ_3C",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__II_3CI",
-#else
 	"objc_1msgSend__JJ_3CJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2",
-#else
 	"objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__II_3F",
-#else
 	"objc_1msgSend__JJ_3D",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__II_3FIF",
-#else
 	"objc_1msgSend__JJ_3DJD",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__II_3I",
-#else
-	"objc_1msgSend__JJ_3J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__II_3II",
-#else
+	"objc_1msgSend__JJ_3I",
 	"objc_1msgSend__JJ_3IJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend__II_3III",
-#else
+	"objc_1msgSend__JJ_3J",
 	"objc_1msgSend__JJ_3JII",
-#endif
-	"objc_1msgSend__JJI",
-	"objc_1msgSend__JJ_3I",
 	"objc_1msgSend__JJ_3JJJ",
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2III",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIII",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIZ",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2I",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZ",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZLorg_eclipse_swt_internal_cocoa_NSRect_2",
-#else
 	"objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZLorg_eclipse_swt_internal_cocoa_NSRect_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#else
 	"objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRange_2I",
-#else
 	"objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRange_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2II",
-#else
 	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I",
-#else
 	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2",
-#else
 	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2I",
-#else
 	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2I",
-#else
 	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2",
-#else
 	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZ",
-#else
 	"objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__II",
-#else
 	"objc_1msgSend_1bool__JJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__III",
-#else
 	"objc_1msgSend_1bool__JJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__IIII",
-#else
 	"objc_1msgSend_1bool__JJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__IIIII",
-#else
 	"objc_1msgSend_1bool__JJJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__IIIIII",
-#else
 	"objc_1msgSend_1bool__JJJJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__IIIIIII",
-#else
 	"objc_1msgSend_1bool__JJJJJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#else
 	"objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__IIILorg_eclipse_swt_internal_cocoa_NSSize_2Z",
-#else
 	"objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSSize_2Z",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#else
 	"objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2",
-#else
 	"objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSRange_2I",
-#else
 	"objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSRect_2",
-#else
 	"objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRect_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1bool__IIS",
-#else
 	"objc_1msgSend_1bool__JJS",
-#endif
 	"objc_1msgSend_1floatret",
-#ifndef JNI64
-	"objc_1msgSend_1fpret__II",
-#else
 	"objc_1msgSend_1fpret__JJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1fpret__III",
-#else
 	"objc_1msgSend_1fpret__JJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1fpret__IIII",
-#else
 	"objc_1msgSend_1fpret__JJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2IILorg_eclipse_swt_internal_cocoa_NSRect_2",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIILorg_eclipse_swt_internal_cocoa_NSRect_2I",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSRect_2",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2IIIII",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2JJJJJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ",
-#endif
-#ifndef JNI64
-	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IIZ",
-#else
 	"objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJZ",
-#endif
 	"objc_1registerClassPair",
 	"objc_1super_1sizeof",
 	"object_1getClass",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
index 1803b9d115..96258bb768 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
@@ -486,56 +486,16 @@ typedef enum {
 	kTISPropertyUnicodeKeyLayoutData_FUNC,
 	kUTTypeFileURL_FUNC,
 	kUTTypeURL_FUNC,
-#ifndef JNI64
-	memmove__ILorg_eclipse_swt_internal_cocoa_CGPathElement_2I_FUNC,
-#else
 	memmove__JLorg_eclipse_swt_internal_cocoa_CGPathElement_2J_FUNC,
-#endif
-#ifndef JNI64
-	memmove__ILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC,
-#else
 	memmove__JLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC,
-#endif
-#ifndef JNI64
-	memmove__ILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC,
-#else
 	memmove__JLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC,
-#endif
-#ifndef JNI64
-	memmove__ILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC,
-#else
 	memmove__JLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC,
-#endif
-#ifndef JNI64
-	memmove__ILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC,
-#else
 	memmove__JLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC,
-#endif
-#ifndef JNI64
-	memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2II_FUNC,
-#else
 	memmove__Lorg_eclipse_swt_internal_cocoa_CGPathElement_2JJ_FUNC,
-#endif
-#ifndef JNI64
-	memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC,
-#else
 	memmove__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC,
-#endif
-#ifndef JNI64
-	memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_FUNC,
-#else
 	memmove__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC,
-#endif
-#ifndef JNI64
-	memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC,
-#else
 	memmove__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC,
-#endif
-#ifndef JNI64
-	memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_FUNC,
-#else
 	memmove__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC,
-#endif
 	method_1setImplementation_FUNC,
 	objc_1allocateClassPair_FUNC,
 	objc_1disposeClassPair_FUNC,
@@ -543,696 +503,147 @@ typedef enum {
 	objc_1getMetaClass_FUNC,
 	objc_1getProtocol_FUNC,
 	objc_1lookUpClass_FUNC,
-#ifndef JNI64
-	objc_1msgSend__II_FUNC,
-#else
 	objc_1msgSend__JJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IID_FUNC,
-#else
 	objc_1msgSend__JJD_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIDIIIZ_FUNC,
-#else
-	objc_1msgSend__JJDJJJZ_FUNC,
-#endif
-	objc_1msgSend__IIF_FUNC,
-#ifndef JNI64
-	objc_1msgSend__IIFF_FUNC,
-#else
 	objc_1msgSend__JJDD_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIFFFF_FUNC,
-#else
 	objc_1msgSend__JJDDDD_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIFI_FUNC,
-#else
 	objc_1msgSend__JJDJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__III_FUNC,
-#else
+	objc_1msgSend__JJDJJJZ_FUNC,
+	objc_1msgSend__JJI_FUNC,
 	objc_1msgSend__JJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIF_FUNC,
-#else
 	objc_1msgSend__JJJD_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIII_FUNC,
-#else
 	objc_1msgSend__JJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIIDI_FUNC,
-#else
 	objc_1msgSend__JJJJDJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIII_FUNC,
-#else
 	objc_1msgSend__JJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIIIF_FUNC,
-#else
 	objc_1msgSend__JJJJJD_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIIII_FUNC,
-#else
 	objc_1msgSend__JJJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIIIII_FUNC,
-#else
 	objc_1msgSend__JJJJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIIIIII_FUNC,
-#else
 	objc_1msgSend__JJJJJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIIIIIII_FUNC,
-#else
 	objc_1msgSend__JJJJJJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIIIIIZZIII_FUNC,
-#else
 	objc_1msgSend__JJJJJJJZZJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIIIIIZZIIII_FUNC,
-#else
 	objc_1msgSend__JJJJJJJZZJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIIIZ_FUNC,
-#else
 	objc_1msgSend__JJJJJZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
-#else
 	objc_1msgSend__JJJJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIIZ_FUNC,
-#else
 	objc_1msgSend__JJJJZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#else
 	objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC,
-#else
 	objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIIIII_FUNC,
-#else
 	objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2IDIISII_FUNC,
-#else
 	objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2JDJJSJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2IIIZ_FUNC,
-#else
 	objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSSize_2JJJZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
-#else
 	objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC,
-#else
 	objc_1msgSend__JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIIZ_FUNC,
-#else
 	objc_1msgSend__JJJZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFF_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDD_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2FFFZ_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2DDDZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_3F_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_3D_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2IIII_3B_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2JJJJ_3B_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2I_3I_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRange_2J_3J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2F_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2D_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2FF_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2DD_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2III_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZ_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IIZI_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JJZJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2IZI_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2JZJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRange_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2IF_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSRect_2JD_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2Z_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2Z_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSRect_2ZZ_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSRect_2ZZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
-#else
 	objc_1msgSend__JJLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIZ_FUNC,
-#else
 	objc_1msgSend__JJZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIZI_FUNC,
-#else
 	objc_1msgSend__JJZJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__IIZLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#else
 	objc_1msgSend__JJZLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__II_3B_FUNC,
-#else
 	objc_1msgSend__JJ_3B_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__II_3BI_FUNC,
-#else
 	objc_1msgSend__JJ_3BJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__II_3C_FUNC,
-#else
 	objc_1msgSend__JJ_3C_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__II_3CI_FUNC,
-#else
 	objc_1msgSend__JJ_3CJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__II_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
-#else
 	objc_1msgSend__JJ_3CLorg_eclipse_swt_internal_cocoa_NSRange_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__II_3F_FUNC,
-#else
 	objc_1msgSend__JJ_3D_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__II_3FIF_FUNC,
-#else
 	objc_1msgSend__JJ_3DJD_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__II_3I_FUNC,
-#else
-	objc_1msgSend__JJ_3J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__II_3II_FUNC,
-#else
+	objc_1msgSend__JJ_3I_FUNC,
 	objc_1msgSend__JJ_3IJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend__II_3III_FUNC,
-#else
+	objc_1msgSend__JJ_3J_FUNC,
 	objc_1msgSend__JJ_3JII_FUNC,
-#endif
-	objc_1msgSend__JJI_FUNC,
-	objc_1msgSend__JJ_3I_FUNC,
 	objc_1msgSend__JJ_3JJJ_FUNC,
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2I_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2II_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2III_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIII_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIIIZ_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJJJZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IIZ_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZ_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#else
 	objc_1msgSendSuper__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#else
 	objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC,
-#else
 	objc_1msgSendSuper_1bool__Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2II_FUNC,
-#else
 	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC,
-#else
 	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#else
 	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC,
-#else
 	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2I_FUNC,
-#else
 	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2ILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#else
 	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2IZ_FUNC,
-#else
 	objc_1msgSendSuper_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2Lorg_eclipse_swt_internal_cocoa_objc_1super_2JZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__II_FUNC,
-#else
 	objc_1msgSend_1bool__JJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__III_FUNC,
-#else
 	objc_1msgSend_1bool__JJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__IIII_FUNC,
-#else
 	objc_1msgSend_1bool__JJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__IIIII_FUNC,
-#else
 	objc_1msgSend_1bool__JJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__IIIIII_FUNC,
-#else
 	objc_1msgSend_1bool__JJJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__IIIIIII_FUNC,
-#else
 	objc_1msgSend_1bool__JJJJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__IIILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#else
 	objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__IIILorg_eclipse_swt_internal_cocoa_NSSize_2Z_FUNC,
-#else
 	objc_1msgSend_1bool__JJJLorg_eclipse_swt_internal_cocoa_NSSize_2Z_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#else
 	objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#else
 	objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSPoint_2Lorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC,
-#else
 	objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#else
 	objc_1msgSend_1bool__JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1bool__IIS_FUNC,
-#else
 	objc_1msgSend_1bool__JJS_FUNC,
-#endif
 	objc_1msgSend_1floatret_FUNC,
-#ifndef JNI64
-	objc_1msgSend_1fpret__II_FUNC,
-#else
 	objc_1msgSend_1fpret__JJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1fpret__III_FUNC,
-#else
 	objc_1msgSend_1fpret__JJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1fpret__IIII_FUNC,
-#else
 	objc_1msgSend_1fpret__JJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2II_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSAffineTransformStruct_2JJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2II_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2III_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2IILorg_eclipse_swt_internal_cocoa_NSPoint_2I_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSPoint_2JJLorg_eclipse_swt_internal_cocoa_NSPoint_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2II_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2III_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRange_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2II_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2III_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIII_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIIIZ_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJJZ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IIILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRange_2I_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRange_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSRect_2I_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSRect_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2II_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSRect_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2I_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2J_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2IIIII_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2JJJJJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IILorg_eclipse_swt_internal_cocoa_NSSize_2ZZI_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJLorg_eclipse_swt_internal_cocoa_NSSize_2ZZJ_FUNC,
-#endif
-#ifndef JNI64
-	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2IIZ_FUNC,
-#else
 	objc_1msgSend_1stret__Lorg_eclipse_swt_internal_cocoa_NSSize_2JJZ_FUNC,
-#endif
 	objc_1registerClassPair_FUNC,
 	objc_1super_1sizeof_FUNC,
 	object_1getClass_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.c
index 67347b101d..7f3619598b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_structs.c
@@ -31,24 +31,24 @@ void cacheCFRangeFields(JNIEnv *env, jobject lpObject)
 {
 	if (CFRangeFc.cached) return;
 	CFRangeFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CFRangeFc.location = (*env)->GetFieldID(env, CFRangeFc.clazz, "location", I_J);
-	CFRangeFc.length = (*env)->GetFieldID(env, CFRangeFc.clazz, "length", I_J);
+	CFRangeFc.location = (*env)->GetFieldID(env, CFRangeFc.clazz, "location", "J");
+	CFRangeFc.length = (*env)->GetFieldID(env, CFRangeFc.clazz, "length", "J");
 	CFRangeFc.cached = 1;
 }
 
 CFRange *getCFRangeFields(JNIEnv *env, jobject lpObject, CFRange *lpStruct)
 {
 	if (!CFRangeFc.cached) cacheCFRangeFields(env, lpObject);
-	lpStruct->location = (CFIndex)(*env)->GetIntLongField(env, lpObject, CFRangeFc.location);
-	lpStruct->length = (CFIndex)(*env)->GetIntLongField(env, lpObject, CFRangeFc.length);
+	lpStruct->location = (CFIndex)(*env)->GetLongField(env, lpObject, CFRangeFc.location);
+	lpStruct->length = (CFIndex)(*env)->GetLongField(env, lpObject, CFRangeFc.length);
 	return lpStruct;
 }
 
 void setCFRangeFields(JNIEnv *env, jobject lpObject, CFRange *lpStruct)
 {
 	if (!CFRangeFc.cached) cacheCFRangeFields(env, lpObject);
-	(*env)->SetIntLongField(env, lpObject, CFRangeFc.location, (jintLong)lpStruct->location);
-	(*env)->SetIntLongField(env, lpObject, CFRangeFc.length, (jintLong)lpStruct->length);
+	(*env)->SetLongField(env, lpObject, CFRangeFc.location, (jlong)lpStruct->location);
+	(*env)->SetLongField(env, lpObject, CFRangeFc.length, (jlong)lpStruct->length);
 }
 #endif
 
@@ -65,36 +65,36 @@ void cacheCGAffineTransformFields(JNIEnv *env, jobject lpObject)
 {
 	if (CGAffineTransformFc.cached) return;
 	CGAffineTransformFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CGAffineTransformFc.a = (*env)->GetFieldID(env, CGAffineTransformFc.clazz, "a", F_D);
-	CGAffineTransformFc.b = (*env)->GetFieldID(env, CGAffineTransformFc.clazz, "b", F_D);
-	CGAffineTransformFc.c = (*env)->GetFieldID(env, CGAffineTransformFc.clazz, "c", F_D);
-	CGAffineTransformFc.d = (*env)->GetFieldID(env, CGAffineTransformFc.clazz, "d", F_D);
-	CGAffineTransformFc.tx = (*env)->GetFieldID(env, CGAffineTransformFc.clazz, "tx", F_D);
-	CGAffineTransformFc.ty = (*env)->GetFieldID(env, CGAffineTransformFc.clazz, "ty", F_D);
+	CGAffineTransformFc.a = (*env)->GetFieldID(env, CGAffineTransformFc.clazz, "a", "D");
+	CGAffineTransformFc.b = (*env)->GetFieldID(env, CGAffineTransformFc.clazz, "b", "D");
+	CGAffineTransformFc.c = (*env)->GetFieldID(env, CGAffineTransformFc.clazz, "c", "D");
+	CGAffineTransformFc.d = (*env)->GetFieldID(env, CGAffineTransformFc.clazz, "d", "D");
+	CGAffineTransformFc.tx = (*env)->GetFieldID(env, CGAffineTransformFc.clazz, "tx", "D");
+	CGAffineTransformFc.ty = (*env)->GetFieldID(env, CGAffineTransformFc.clazz, "ty", "D");
 	CGAffineTransformFc.cached = 1;
 }
 
 CGAffineTransform *getCGAffineTransformFields(JNIEnv *env, jobject lpObject, CGAffineTransform *lpStruct)
 {
 	if (!CGAffineTransformFc.cached) cacheCGAffineTransformFields(env, lpObject);
-	lpStruct->a = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.a);
-	lpStruct->b = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.b);
-	lpStruct->c = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.c);
-	lpStruct->d = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.d);
-	lpStruct->tx = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.tx);
-	lpStruct->ty = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGAffineTransformFc.ty);
+	lpStruct->a = (CGFloat)(*env)->GetDoubleField(env, lpObject, CGAffineTransformFc.a);
+	lpStruct->b = (CGFloat)(*env)->GetDoubleField(env, lpObject, CGAffineTransformFc.b);
+	lpStruct->c = (CGFloat)(*env)->GetDoubleField(env, lpObject, CGAffineTransformFc.c);
+	lpStruct->d = (CGFloat)(*env)->GetDoubleField(env, lpObject, CGAffineTransformFc.d);
+	lpStruct->tx = (CGFloat)(*env)->GetDoubleField(env, lpObject, CGAffineTransformFc.tx);
+	lpStruct->ty = (CGFloat)(*env)->GetDoubleField(env, lpObject, CGAffineTransformFc.ty);
 	return lpStruct;
 }
 
 void setCGAffineTransformFields(JNIEnv *env, jobject lpObject, CGAffineTransform *lpStruct)
 {
 	if (!CGAffineTransformFc.cached) cacheCGAffineTransformFields(env, lpObject);
-	(*env)->SetFloatDoubleField(env, lpObject, CGAffineTransformFc.a, (jfloatDouble)lpStruct->a);
-	(*env)->SetFloatDoubleField(env, lpObject, CGAffineTransformFc.b, (jfloatDouble)lpStruct->b);
-	(*env)->SetFloatDoubleField(env, lpObject, CGAffineTransformFc.c, (jfloatDouble)lpStruct->c);
-	(*env)->SetFloatDoubleField(env, lpObject, CGAffineTransformFc.d, (jfloatDouble)lpStruct->d);
-	(*env)->SetFloatDoubleField(env, lpObject, CGAffineTransformFc.tx, (jfloatDouble)lpStruct->tx);
-	(*env)->SetFloatDoubleField(env, lpObject, CGAffineTransformFc.ty, (jfloatDouble)lpStruct->ty);
+	(*env)->SetDoubleField(env, lpObject, CGAffineTransformFc.a, (jdouble)lpStruct->a);
+	(*env)->SetDoubleField(env, lpObject, CGAffineTransformFc.b, (jdouble)lpStruct->b);
+	(*env)->SetDoubleField(env, lpObject, CGAffineTransformFc.c, (jdouble)lpStruct->c);
+	(*env)->SetDoubleField(env, lpObject, CGAffineTransformFc.d, (jdouble)lpStruct->d);
+	(*env)->SetDoubleField(env, lpObject, CGAffineTransformFc.tx, (jdouble)lpStruct->tx);
+	(*env)->SetDoubleField(env, lpObject, CGAffineTransformFc.ty, (jdouble)lpStruct->ty);
 }
 #endif
 
@@ -112,7 +112,7 @@ void cacheCGPathElementFields(JNIEnv *env, jobject lpObject)
 	if (CGPathElementFc.cached) return;
 	CGPathElementFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	CGPathElementFc.type = (*env)->GetFieldID(env, CGPathElementFc.clazz, "type", "I");
-	CGPathElementFc.points = (*env)->GetFieldID(env, CGPathElementFc.clazz, "points", I_J);
+	CGPathElementFc.points = (*env)->GetFieldID(env, CGPathElementFc.clazz, "points", "J");
 	CGPathElementFc.cached = 1;
 }
 
@@ -120,7 +120,7 @@ CGPathElement *getCGPathElementFields(JNIEnv *env, jobject lpObject, CGPathEleme
 {
 	if (!CGPathElementFc.cached) cacheCGPathElementFields(env, lpObject);
 	lpStruct->type = (CGPathElementType)(*env)->GetIntField(env, lpObject, CGPathElementFc.type);
-	lpStruct->points = (CGPoint*)(*env)->GetIntLongField(env, lpObject, CGPathElementFc.points);
+	lpStruct->points = (CGPoint*)(*env)->GetLongField(env, lpObject, CGPathElementFc.points);
 	return lpStruct;
 }
 
@@ -128,7 +128,7 @@ void setCGPathElementFields(JNIEnv *env, jobject lpObject, CGPathElement *lpStru
 {
 	if (!CGPathElementFc.cached) cacheCGPathElementFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, CGPathElementFc.type, (jint)lpStruct->type);
-	(*env)->SetIntLongField(env, lpObject, CGPathElementFc.points, (jintLong)lpStruct->points);
+	(*env)->SetLongField(env, lpObject, CGPathElementFc.points, (jlong)lpStruct->points);
 }
 #endif
 
@@ -145,24 +145,24 @@ void cacheCGPointFields(JNIEnv *env, jobject lpObject)
 {
 	if (CGPointFc.cached) return;
 	CGPointFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CGPointFc.x = (*env)->GetFieldID(env, CGPointFc.clazz, "x", F_D);
-	CGPointFc.y = (*env)->GetFieldID(env, CGPointFc.clazz, "y", F_D);
+	CGPointFc.x = (*env)->GetFieldID(env, CGPointFc.clazz, "x", "D");
+	CGPointFc.y = (*env)->GetFieldID(env, CGPointFc.clazz, "y", "D");
 	CGPointFc.cached = 1;
 }
 
 CGPoint *getCGPointFields(JNIEnv *env, jobject lpObject, CGPoint *lpStruct)
 {
 	if (!CGPointFc.cached) cacheCGPointFields(env, lpObject);
-	lpStruct->x = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGPointFc.x);
-	lpStruct->y = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGPointFc.y);
+	lpStruct->x = (CGFloat)(*env)->GetDoubleField(env, lpObject, CGPointFc.x);
+	lpStruct->y = (CGFloat)(*env)->GetDoubleField(env, lpObject, CGPointFc.y);
 	return lpStruct;
 }
 
 void setCGPointFields(JNIEnv *env, jobject lpObject, CGPoint *lpStruct)
 {
 	if (!CGPointFc.cached) cacheCGPointFields(env, lpObject);
-	(*env)->SetFloatDoubleField(env, lpObject, CGPointFc.x, (jfloatDouble)lpStruct->x);
-	(*env)->SetFloatDoubleField(env, lpObject, CGPointFc.y, (jfloatDouble)lpStruct->y);
+	(*env)->SetDoubleField(env, lpObject, CGPointFc.x, (jdouble)lpStruct->x);
+	(*env)->SetDoubleField(env, lpObject, CGPointFc.y, (jdouble)lpStruct->y);
 }
 #endif
 
@@ -225,24 +225,24 @@ void cacheCGSizeFields(JNIEnv *env, jobject lpObject)
 {
 	if (CGSizeFc.cached) return;
 	CGSizeFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	CGSizeFc.width = (*env)->GetFieldID(env, CGSizeFc.clazz, "width", F_D);
-	CGSizeFc.height = (*env)->GetFieldID(env, CGSizeFc.clazz, "height", F_D);
+	CGSizeFc.width = (*env)->GetFieldID(env, CGSizeFc.clazz, "width", "D");
+	CGSizeFc.height = (*env)->GetFieldID(env, CGSizeFc.clazz, "height", "D");
 	CGSizeFc.cached = 1;
 }
 
 CGSize *getCGSizeFields(JNIEnv *env, jobject lpObject, CGSize *lpStruct)
 {
 	if (!CGSizeFc.cached) cacheCGSizeFields(env, lpObject);
-	lpStruct->width = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGSizeFc.width);
-	lpStruct->height = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, CGSizeFc.height);
+	lpStruct->width = (CGFloat)(*env)->GetDoubleField(env, lpObject, CGSizeFc.width);
+	lpStruct->height = (CGFloat)(*env)->GetDoubleField(env, lpObject, CGSizeFc.height);
 	return lpStruct;
 }
 
 void setCGSizeFields(JNIEnv *env, jobject lpObject, CGSize *lpStruct)
 {
 	if (!CGSizeFc.cached) cacheCGSizeFields(env, lpObject);
-	(*env)->SetFloatDoubleField(env, lpObject, CGSizeFc.width, (jfloatDouble)lpStruct->width);
-	(*env)->SetFloatDoubleField(env, lpObject, CGSizeFc.height, (jfloatDouble)lpStruct->height);
+	(*env)->SetDoubleField(env, lpObject, CGSizeFc.width, (jdouble)lpStruct->width);
+	(*env)->SetDoubleField(env, lpObject, CGSizeFc.height, (jdouble)lpStruct->height);
 }
 #endif
 
@@ -260,8 +260,8 @@ void cacheCTParagraphStyleSettingFields(JNIEnv *env, jobject lpObject)
 	if (CTParagraphStyleSettingFc.cached) return;
 	CTParagraphStyleSettingFc.clazz = (*env)->GetObjectClass(env, lpObject);
 	CTParagraphStyleSettingFc.spec = (*env)->GetFieldID(env, CTParagraphStyleSettingFc.clazz, "spec", "I");
-	CTParagraphStyleSettingFc.valueSize = (*env)->GetFieldID(env, CTParagraphStyleSettingFc.clazz, "valueSize", I_J);
-	CTParagraphStyleSettingFc.value = (*env)->GetFieldID(env, CTParagraphStyleSettingFc.clazz, "value", I_J);
+	CTParagraphStyleSettingFc.valueSize = (*env)->GetFieldID(env, CTParagraphStyleSettingFc.clazz, "valueSize", "J");
+	CTParagraphStyleSettingFc.value = (*env)->GetFieldID(env, CTParagraphStyleSettingFc.clazz, "value", "J");
 	CTParagraphStyleSettingFc.cached = 1;
 }
 
@@ -269,8 +269,8 @@ CTParagraphStyleSetting *getCTParagraphStyleSettingFields(JNIEnv *env, jobject l
 {
 	if (!CTParagraphStyleSettingFc.cached) cacheCTParagraphStyleSettingFields(env, lpObject);
 	lpStruct->spec = (CTParagraphStyleSpecifier)(*env)->GetIntField(env, lpObject, CTParagraphStyleSettingFc.spec);
-	lpStruct->valueSize = (size_t)(*env)->GetIntLongField(env, lpObject, CTParagraphStyleSettingFc.valueSize);
-	lpStruct->value = (void*)(*env)->GetIntLongField(env, lpObject, CTParagraphStyleSettingFc.value);
+	lpStruct->valueSize = (size_t)(*env)->GetLongField(env, lpObject, CTParagraphStyleSettingFc.valueSize);
+	lpStruct->value = (void*)(*env)->GetLongField(env, lpObject, CTParagraphStyleSettingFc.value);
 	return lpStruct;
 }
 
@@ -278,8 +278,8 @@ void setCTParagraphStyleSettingFields(JNIEnv *env, jobject lpObject, CTParagraph
 {
 	if (!CTParagraphStyleSettingFc.cached) cacheCTParagraphStyleSettingFields(env, lpObject);
 	(*env)->SetIntField(env, lpObject, CTParagraphStyleSettingFc.spec, (jint)lpStruct->spec);
-	(*env)->SetIntLongField(env, lpObject, CTParagraphStyleSettingFc.valueSize, (jintLong)lpStruct->valueSize);
-	(*env)->SetIntLongField(env, lpObject, CTParagraphStyleSettingFc.value, (jintLong)lpStruct->value);
+	(*env)->SetLongField(env, lpObject, CTParagraphStyleSettingFc.valueSize, (jlong)lpStruct->valueSize);
+	(*env)->SetLongField(env, lpObject, CTParagraphStyleSettingFc.value, (jlong)lpStruct->value);
 }
 #endif
 
@@ -296,36 +296,36 @@ void cacheNSAffineTransformStructFields(JNIEnv *env, jobject lpObject)
 {
 	if (NSAffineTransformStructFc.cached) return;
 	NSAffineTransformStructFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NSAffineTransformStructFc.m11 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m11", F_D);
-	NSAffineTransformStructFc.m12 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m12", F_D);
-	NSAffineTransformStructFc.m21 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m21", F_D);
-	NSAffineTransformStructFc.m22 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m22", F_D);
-	NSAffineTransformStructFc.tX = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "tX", F_D);
-	NSAffineTransformStructFc.tY = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "tY", F_D);
+	NSAffineTransformStructFc.m11 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m11", "D");
+	NSAffineTransformStructFc.m12 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m12", "D");
+	NSAffineTransformStructFc.m21 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m21", "D");
+	NSAffineTransformStructFc.m22 = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "m22", "D");
+	NSAffineTransformStructFc.tX = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "tX", "D");
+	NSAffineTransformStructFc.tY = (*env)->GetFieldID(env, NSAffineTransformStructFc.clazz, "tY", "D");
 	NSAffineTransformStructFc.cached = 1;
 }
 
 NSAffineTransformStruct *getNSAffineTransformStructFields(JNIEnv *env, jobject lpObject, NSAffineTransformStruct *lpStruct)
 {
 	if (!NSAffineTransformStructFc.cached) cacheNSAffineTransformStructFields(env, lpObject);
-	lpStruct->m11 = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m11);
-	lpStruct->m12 = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m12);
-	lpStruct->m21 = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m21);
-	lpStruct->m22 = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m22);
-	lpStruct->tX = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.tX);
-	lpStruct->tY = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.tY);
+	lpStruct->m11 = (CGFloat)(*env)->GetDoubleField(env, lpObject, NSAffineTransformStructFc.m11);
+	lpStruct->m12 = (CGFloat)(*env)->GetDoubleField(env, lpObject, NSAffineTransformStructFc.m12);
+	lpStruct->m21 = (CGFloat)(*env)->GetDoubleField(env, lpObject, NSAffineTransformStructFc.m21);
+	lpStruct->m22 = (CGFloat)(*env)->GetDoubleField(env, lpObject, NSAffineTransformStructFc.m22);
+	lpStruct->tX = (CGFloat)(*env)->GetDoubleField(env, lpObject, NSAffineTransformStructFc.tX);
+	lpStruct->tY = (CGFloat)(*env)->GetDoubleField(env, lpObject, NSAffineTransformStructFc.tY);
 	return lpStruct;
 }
 
 void setNSAffineTransformStructFields(JNIEnv *env, jobject lpObject, NSAffineTransformStruct *lpStruct)
 {
 	if (!NSAffineTransformStructFc.cached) cacheNSAffineTransformStructFields(env, lpObject);
-	(*env)->SetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m11, (jfloatDouble)lpStruct->m11);
-	(*env)->SetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m12, (jfloatDouble)lpStruct->m12);
-	(*env)->SetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m21, (jfloatDouble)lpStruct->m21);
-	(*env)->SetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.m22, (jfloatDouble)lpStruct->m22);
-	(*env)->SetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.tX, (jfloatDouble)lpStruct->tX);
-	(*env)->SetFloatDoubleField(env, lpObject, NSAffineTransformStructFc.tY, (jfloatDouble)lpStruct->tY);
+	(*env)->SetDoubleField(env, lpObject, NSAffineTransformStructFc.m11, (jdouble)lpStruct->m11);
+	(*env)->SetDoubleField(env, lpObject, NSAffineTransformStructFc.m12, (jdouble)lpStruct->m12);
+	(*env)->SetDoubleField(env, lpObject, NSAffineTransformStructFc.m21, (jdouble)lpStruct->m21);
+	(*env)->SetDoubleField(env, lpObject, NSAffineTransformStructFc.m22, (jdouble)lpStruct->m22);
+	(*env)->SetDoubleField(env, lpObject, NSAffineTransformStructFc.tX, (jdouble)lpStruct->tX);
+	(*env)->SetDoubleField(env, lpObject, NSAffineTransformStructFc.tY, (jdouble)lpStruct->tY);
 }
 #endif
 
@@ -342,24 +342,24 @@ void cacheNSPointFields(JNIEnv *env, jobject lpObject)
 {
 	if (NSPointFc.cached) return;
 	NSPointFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NSPointFc.x = (*env)->GetFieldID(env, NSPointFc.clazz, "x", F_D);
-	NSPointFc.y = (*env)->GetFieldID(env, NSPointFc.clazz, "y", F_D);
+	NSPointFc.x = (*env)->GetFieldID(env, NSPointFc.clazz, "x", "D");
+	NSPointFc.y = (*env)->GetFieldID(env, NSPointFc.clazz, "y", "D");
 	NSPointFc.cached = 1;
 }
 
 NSPoint *getNSPointFields(JNIEnv *env, jobject lpObject, NSPoint *lpStruct)
 {
 	if (!NSPointFc.cached) cacheNSPointFields(env, lpObject);
-	lpStruct->x = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSPointFc.x);
-	lpStruct->y = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSPointFc.y);
+	lpStruct->x = (CGFloat)(*env)->GetDoubleField(env, lpObject, NSPointFc.x);
+	lpStruct->y = (CGFloat)(*env)->GetDoubleField(env, lpObject, NSPointFc.y);
 	return lpStruct;
 }
 
 void setNSPointFields(JNIEnv *env, jobject lpObject, NSPoint *lpStruct)
 {
 	if (!NSPointFc.cached) cacheNSPointFields(env, lpObject);
-	(*env)->SetFloatDoubleField(env, lpObject, NSPointFc.x, (jfloatDouble)lpStruct->x);
-	(*env)->SetFloatDoubleField(env, lpObject, NSPointFc.y, (jfloatDouble)lpStruct->y);
+	(*env)->SetDoubleField(env, lpObject, NSPointFc.x, (jdouble)lpStruct->x);
+	(*env)->SetDoubleField(env, lpObject, NSPointFc.y, (jdouble)lpStruct->y);
 }
 #endif
 
@@ -376,24 +376,24 @@ void cacheNSRangeFields(JNIEnv *env, jobject lpObject)
 {
 	if (NSRangeFc.cached) return;
 	NSRangeFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NSRangeFc.location = (*env)->GetFieldID(env, NSRangeFc.clazz, "location", I_J);
-	NSRangeFc.length = (*env)->GetFieldID(env, NSRangeFc.clazz, "length", I_J);
+	NSRangeFc.location = (*env)->GetFieldID(env, NSRangeFc.clazz, "location", "J");
+	NSRangeFc.length = (*env)->GetFieldID(env, NSRangeFc.clazz, "length", "J");
 	NSRangeFc.cached = 1;
 }
 
 NSRange *getNSRangeFields(JNIEnv *env, jobject lpObject, NSRange *lpStruct)
 {
 	if (!NSRangeFc.cached) cacheNSRangeFields(env, lpObject);
-	lpStruct->location = (NSUInteger)(*env)->GetIntLongField(env, lpObject, NSRangeFc.location);
-	lpStruct->length = (NSUInteger)(*env)->GetIntLongField(env, lpObject, NSRangeFc.length);
+	lpStruct->location = (NSUInteger)(*env)->GetLongField(env, lpObject, NSRangeFc.location);
+	lpStruct->length = (NSUInteger)(*env)->GetLongField(env, lpObject, NSRangeFc.length);
 	return lpStruct;
 }
 
 void setNSRangeFields(JNIEnv *env, jobject lpObject, NSRange *lpStruct)
 {
 	if (!NSRangeFc.cached) cacheNSRangeFields(env, lpObject);
-	(*env)->SetIntLongField(env, lpObject, NSRangeFc.location, (jintLong)lpStruct->location);
-	(*env)->SetIntLongField(env, lpObject, NSRangeFc.length, (jintLong)lpStruct->length);
+	(*env)->SetLongField(env, lpObject, NSRangeFc.location, (jlong)lpStruct->location);
+	(*env)->SetLongField(env, lpObject, NSRangeFc.length, (jlong)lpStruct->length);
 }
 #endif
 
@@ -410,30 +410,30 @@ void cacheNSRectFields(JNIEnv *env, jobject lpObject)
 {
 	if (NSRectFc.cached) return;
 	NSRectFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NSRectFc.x = (*env)->GetFieldID(env, NSRectFc.clazz, "x", F_D);
-	NSRectFc.y = (*env)->GetFieldID(env, NSRectFc.clazz, "y", F_D);
-	NSRectFc.width = (*env)->GetFieldID(env, NSRectFc.clazz, "width", F_D);
-	NSRectFc.height = (*env)->GetFieldID(env, NSRectFc.clazz, "height", F_D);
+	NSRectFc.x = (*env)->GetFieldID(env, NSRectFc.clazz, "x", "D");
+	NSRectFc.y = (*env)->GetFieldID(env, NSRectFc.clazz, "y", "D");
+	NSRectFc.width = (*env)->GetFieldID(env, NSRectFc.clazz, "width", "D");
+	NSRectFc.height = (*env)->GetFieldID(env, NSRectFc.clazz, "height", "D");
 	NSRectFc.cached = 1;
 }
 
 NSRect *getNSRectFields(JNIEnv *env, jobject lpObject, NSRect *lpStruct)
 {
 	if (!NSRectFc.cached) cacheNSRectFields(env, lpObject);
-	lpStruct->origin.x = (*env)->GetFloatDoubleField(env, lpObject, NSRectFc.x);
-	lpStruct->origin.y = (*env)->GetFloatDoubleField(env, lpObject, NSRectFc.y);
-	lpStruct->size.width = (*env)->GetFloatDoubleField(env, lpObject, NSRectFc.width);
-	lpStruct->size.height = (*env)->GetFloatDoubleField(env, lpObject, NSRectFc.height);
+	lpStruct->origin.x = (*env)->GetDoubleField(env, lpObject, NSRectFc.x);
+	lpStruct->origin.y = (*env)->GetDoubleField(env, lpObject, NSRectFc.y);
+	lpStruct->size.width = (*env)->GetDoubleField(env, lpObject, NSRectFc.width);
+	lpStruct->size.height = (*env)->GetDoubleField(env, lpObject, NSRectFc.height);
 	return lpStruct;
 }
 
 void setNSRectFields(JNIEnv *env, jobject lpObject, NSRect *lpStruct)
 {
 	if (!NSRectFc.cached) cacheNSRectFields(env, lpObject);
-	(*env)->SetFloatDoubleField(env, lpObject, NSRectFc.x, (jfloatDouble)lpStruct->origin.x);
-	(*env)->SetFloatDoubleField(env, lpObject, NSRectFc.y, (jfloatDouble)lpStruct->origin.y);
-	(*env)->SetFloatDoubleField(env, lpObject, NSRectFc.width, (jfloatDouble)lpStruct->size.width);
-	(*env)->SetFloatDoubleField(env, lpObject, NSRectFc.height, (jfloatDouble)lpStruct->size.height);
+	(*env)->SetDoubleField(env, lpObject, NSRectFc.x, (jdouble)lpStruct->origin.x);
+	(*env)->SetDoubleField(env, lpObject, NSRectFc.y, (jdouble)lpStruct->origin.y);
+	(*env)->SetDoubleField(env, lpObject, NSRectFc.width, (jdouble)lpStruct->size.width);
+	(*env)->SetDoubleField(env, lpObject, NSRectFc.height, (jdouble)lpStruct->size.height);
 }
 #endif
 
@@ -450,24 +450,24 @@ void cacheNSSizeFields(JNIEnv *env, jobject lpObject)
 {
 	if (NSSizeFc.cached) return;
 	NSSizeFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	NSSizeFc.width = (*env)->GetFieldID(env, NSSizeFc.clazz, "width", F_D);
-	NSSizeFc.height = (*env)->GetFieldID(env, NSSizeFc.clazz, "height", F_D);
+	NSSizeFc.width = (*env)->GetFieldID(env, NSSizeFc.clazz, "width", "D");
+	NSSizeFc.height = (*env)->GetFieldID(env, NSSizeFc.clazz, "height", "D");
 	NSSizeFc.cached = 1;
 }
 
 NSSize *getNSSizeFields(JNIEnv *env, jobject lpObject, NSSize *lpStruct)
 {
 	if (!NSSizeFc.cached) cacheNSSizeFields(env, lpObject);
-	lpStruct->width = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSSizeFc.width);
-	lpStruct->height = (CGFloat)(*env)->GetFloatDoubleField(env, lpObject, NSSizeFc.height);
+	lpStruct->width = (CGFloat)(*env)->GetDoubleField(env, lpObject, NSSizeFc.width);
+	lpStruct->height = (CGFloat)(*env)->GetDoubleField(env, lpObject, NSSizeFc.height);
 	return lpStruct;
 }
 
 void setNSSizeFields(JNIEnv *env, jobject lpObject, NSSize *lpStruct)
 {
 	if (!NSSizeFc.cached) cacheNSSizeFields(env, lpObject);
-	(*env)->SetFloatDoubleField(env, lpObject, NSSizeFc.width, (jfloatDouble)lpStruct->width);
-	(*env)->SetFloatDoubleField(env, lpObject, NSSizeFc.height, (jfloatDouble)lpStruct->height);
+	(*env)->SetDoubleField(env, lpObject, NSSizeFc.width, (jdouble)lpStruct->width);
+	(*env)->SetDoubleField(env, lpObject, NSSizeFc.height, (jdouble)lpStruct->height);
 }
 #endif
 
@@ -518,24 +518,24 @@ void cacheobjc_superFields(JNIEnv *env, jobject lpObject)
 {
 	if (objc_superFc.cached) return;
 	objc_superFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	objc_superFc.receiver = (*env)->GetFieldID(env, objc_superFc.clazz, "receiver", I_J);
-	objc_superFc.super_class = (*env)->GetFieldID(env, objc_superFc.clazz, "super_class", I_J);
+	objc_superFc.receiver = (*env)->GetFieldID(env, objc_superFc.clazz, "receiver", "J");
+	objc_superFc.super_class = (*env)->GetFieldID(env, objc_superFc.clazz, "super_class", "J");
 	objc_superFc.cached = 1;
 }
 
 struct objc_super *getobjc_superFields(JNIEnv *env, jobject lpObject, struct objc_super *lpStruct)
 {
 	if (!objc_superFc.cached) cacheobjc_superFields(env, lpObject);
-	lpStruct->receiver = (id)(*env)->GetIntLongField(env, lpObject, objc_superFc.receiver);
-	lpStruct->swt_super_class = (Class)(*env)->GetIntLongField(env, lpObject, objc_superFc.super_class);
+	lpStruct->receiver = (id)(*env)->GetLongField(env, lpObject, objc_superFc.receiver);
+	lpStruct->swt_super_class = (Class)(*env)->GetLongField(env, lpObject, objc_superFc.super_class);
 	return lpStruct;
 }
 
 void setobjc_superFields(JNIEnv *env, jobject lpObject, struct objc_super *lpStruct)
 {
 	if (!objc_superFc.cached) cacheobjc_superFields(env, lpObject);
-	(*env)->SetIntLongField(env, lpObject, objc_superFc.receiver, (jintLong)lpStruct->receiver);
-	(*env)->SetIntLongField(env, lpObject, objc_superFc.super_class, (jintLong)lpStruct->swt_super_class);
+	(*env)->SetLongField(env, lpObject, objc_superFc.receiver, (jlong)lpStruct->receiver);
+	(*env)->SetLongField(env, lpObject, objc_superFc.super_class, (jlong)lpStruct->swt_super_class);
 }
 #endif
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java
index e0f0559b89..86d8b46e7e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CFRange.java
@@ -15,8 +15,8 @@ package org.eclipse.swt.internal.cocoa;
 
 public class CFRange {
 	/** @field cast=(CFIndex) */
-	public long /*int*/ location;
+	public long location;
 	/** @field cast=(CFIndex) */
-	public long /*int*/ length;
+	public long length;
 	public static final int sizeof = OS.CFRange_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java
index 5b18762594..6833d29f57 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGAffineTransform.java
@@ -15,16 +15,16 @@ package org.eclipse.swt.internal.cocoa;
 
 public class CGAffineTransform {
 	/** @field cast=(CGFloat) */
-	public double /*float*/ a;
+	public double a;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ b;
+	public double b;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ c;
+	public double c;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ d;
+	public double d;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ tx;
+	public double tx;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ ty;
+	public double ty;
 	public static final int sizeof = OS.CGAffineTransform_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java
index 381738c3c5..53f3878fb4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPathElement.java
@@ -17,6 +17,6 @@ public class CGPathElement {
 	/** @field cast=(CGPathElementType) */
 	public int type;
 	/** @field cast=(CGPoint*) */
-	public long /*int*/ points;
+	public long points;
 	public static final int sizeof = OS.CGPathElement_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java
index 1364ba524b..e3697e6e8f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGPoint.java
@@ -15,8 +15,8 @@ package org.eclipse.swt.internal.cocoa;
 
 public class CGPoint {
 	/** @field cast=(CGFloat) */
-	public double /*float*/ x;
+	public double x;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ y;
+	public double y;
 	public static final int sizeof = OS.CGPoint_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java
index 09edc415d0..e7e5f1f28d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CGSize.java
@@ -15,8 +15,8 @@ package org.eclipse.swt.internal.cocoa;
 
 public class CGSize {
 	/** @field cast=(CGFloat) */
-	public double /*float*/ width;
+	public double width;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ height;
+	public double height;
 	public static final int sizeof = OS.CGSize_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java
index 0163c64bd3..07579facda 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CTParagraphStyleSetting.java
@@ -17,8 +17,8 @@ public class CTParagraphStyleSetting {
 	/** @field cast=(CTParagraphStyleSpecifier) */
 	public int spec;
 	/** @field cast=(size_t) */
-	public long /*int*/ valueSize;
+	public long valueSize;
 	/** @field cast=(void*) */
-	public long /*int*/ value;
+	public long value;
 	public static final int sizeof = OS.CTParagraphStyleSetting_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMDocument.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMDocument.java
index 42f9b4e136..3f83411903 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMDocument.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMDocument.java
@@ -19,7 +19,7 @@ public DOMDocument() {
 	super();
 }
 
-public DOMDocument(long /*int*/ id) {
+public DOMDocument(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public DOMDocument(id id) {
 }
 
 public WebFrame webFrame() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_webFrame);
+	long result = OS.objc_msgSend(this.id, OS.sel_webFrame);
 	return result != 0 ? new WebFrame(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMEvent.java
index d8f9e19585..1e7657910b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMEvent.java
@@ -19,7 +19,7 @@ public DOMEvent() {
 	super();
 }
 
-public DOMEvent(long /*int*/ id) {
+public DOMEvent(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMKeyboardEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMKeyboardEvent.java
index 891b84eb8d..272023cb19 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMKeyboardEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMKeyboardEvent.java
@@ -19,7 +19,7 @@ public DOMKeyboardEvent() {
 	super();
 }
 
-public DOMKeyboardEvent(long /*int*/ id) {
+public DOMKeyboardEvent(long id) {
 	super(id);
 }
 
@@ -32,7 +32,7 @@ public boolean altKey() {
 }
 
 public int charCode() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_charCode);
+	return (int)OS.objc_msgSend(this.id, OS.sel_charCode);
 }
 
 public boolean ctrlKey() {
@@ -40,7 +40,7 @@ public boolean ctrlKey() {
 }
 
 public int keyCode() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_keyCode);
+	return (int)OS.objc_msgSend(this.id, OS.sel_keyCode);
 }
 
 public boolean metaKey() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMMouseEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMMouseEvent.java
index 19775c4816..af50e8ebd9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMMouseEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMMouseEvent.java
@@ -19,7 +19,7 @@ public DOMMouseEvent() {
 	super();
 }
 
-public DOMMouseEvent(long /*int*/ id) {
+public DOMMouseEvent(long id) {
 	super(id);
 }
 
@@ -44,11 +44,11 @@ public boolean metaKey() {
 }
 
 public int screenX() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_screenX);
+	return (int)OS.objc_msgSend(this.id, OS.sel_screenX);
 }
 
 public int screenY() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_screenY);
+	return (int)OS.objc_msgSend(this.id, OS.sel_screenY);
 }
 
 public boolean shiftKey() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java
index 502740cf71..3ceadfb7ff 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMUIEvent.java
@@ -19,7 +19,7 @@ public DOMUIEvent() {
 	super();
 }
 
-public DOMUIEvent(long /*int*/ id) {
+public DOMUIEvent(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public DOMUIEvent(id id) {
 }
 
 public int detail() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_detail);
+	return (int)OS.objc_msgSend(this.id, OS.sel_detail);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java
index d2ed4a115c..762716174c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java
@@ -19,7 +19,7 @@ public DOMWheelEvent() {
 	super();
 }
 
-public DOMWheelEvent(long /*int*/ id) {
+public DOMWheelEvent(long id) {
 	super(id);
 }
 
@@ -28,15 +28,15 @@ public DOMWheelEvent(id id) {
 }
 
 public int wheelDelta() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_wheelDelta);
+	return (int)OS.objc_msgSend(this.id, OS.sel_wheelDelta);
 }
 
 public int wheelDeltaX() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_wheelDeltaX);
+	return (int)OS.objc_msgSend(this.id, OS.sel_wheelDeltaX);
 }
 
 public int wheelDeltaY() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_wheelDeltaY);
+	return (int)OS.objc_msgSend(this.id, OS.sel_wheelDeltaY);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java
index 00ce2706e6..ca2f1dcc2d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java
@@ -19,7 +19,7 @@ public NSActionCell() {
 	super();
 }
 
-public NSActionCell(long /*int*/ id) {
+public NSActionCell(long id) {
 	super(id);
 }
 
@@ -27,11 +27,11 @@ public NSActionCell(id id) {
 	super(id);
 }
 
-public long /*int*/ action() {
+public long action() {
 	return OS.objc_msgSend(this.id, OS.sel_action);
 }
 
-public void setAction(long /*int*/ action) {
+public void setAction(long action) {
 	OS.objc_msgSend(this.id, OS.sel_setAction_, action);
 }
 
@@ -40,7 +40,7 @@ public void setTarget(id target) {
 }
 
 public id target() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_target);
+	long result = OS.objc_msgSend(this.id, OS.sel_target);
 	return result != 0 ? new id(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java
index b9bb9c6b47..bfbdcc2be8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransform.java
@@ -19,7 +19,7 @@ public NSAffineTransform() {
 	super();
 }
 
-public NSAffineTransform(long /*int*/ id) {
+public NSAffineTransform(long id) {
 	super(id);
 }
 
@@ -36,7 +36,7 @@ public void set() {
 }
 
 public NSAffineTransform initWithTransform(NSAffineTransform transform) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTransform_, transform != null ? transform.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithTransform_, transform != null ? transform.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSAffineTransform(result) : null);
 }
 
@@ -48,11 +48,11 @@ public void prependTransform(NSAffineTransform transform) {
 	OS.objc_msgSend(this.id, OS.sel_prependTransform_, transform != null ? transform.id : 0);
 }
 
-public void rotateByDegrees(double /*float*/ angle) {
+public void rotateByDegrees(double angle) {
 	OS.objc_msgSend(this.id, OS.sel_rotateByDegrees_, angle);
 }
 
-public void scaleXBy(double /*float*/ scaleX, double /*float*/ scaleY) {
+public void scaleXBy(double scaleX, double scaleY) {
 	OS.objc_msgSend(this.id, OS.sel_scaleXBy_yBy_, scaleX, scaleY);
 }
 
@@ -61,7 +61,7 @@ public void setTransformStruct(NSAffineTransformStruct transformStruct) {
 }
 
 public static NSAffineTransform transform() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSAffineTransform, OS.sel_transform);
+	long result = OS.objc_msgSend(OS.class_NSAffineTransform, OS.sel_transform);
 	return result != 0 ? new NSAffineTransform(result) : null;
 }
 
@@ -83,7 +83,7 @@ public NSAffineTransformStruct transformStruct() {
 	return result;
 }
 
-public void translateXBy(double /*float*/ deltaX, double /*float*/ deltaY) {
+public void translateXBy(double deltaX, double deltaY) {
 	OS.objc_msgSend(this.id, OS.sel_translateXBy_yBy_, deltaX, deltaY);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java
index a31170102e..e63c8776bf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAffineTransformStruct.java
@@ -15,16 +15,16 @@ package org.eclipse.swt.internal.cocoa;
 
 public class NSAffineTransformStruct {
 	/** @field cast=(CGFloat) */
-	public double /*float*/ m11;
+	public double m11;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ m12;
+	public double m12;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ m21;
+	public double m21;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ m22;
+	public double m22;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ tX;
+	public double tX;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ tY;
+	public double tY;
 	public static final int sizeof = OS.NSAffineTransformStruct_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java
index d6706a14c3..c113594043 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java
@@ -19,7 +19,7 @@ public NSAlert() {
 	super();
 }
 
-public NSAlert(long /*int*/ id) {
+public NSAlert(long id) {
 	super(id);
 }
 
@@ -28,19 +28,19 @@ public NSAlert(id id) {
 }
 
 public NSButton addButtonWithTitle(NSString title) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_addButtonWithTitle_, title != null ? title.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_addButtonWithTitle_, title != null ? title.id : 0);
 	return result != 0 ? new NSButton(result) : null;
 }
 
-public void beginSheetModalForWindow(NSWindow window, id delegate, long /*int*/ didEndSelector, long /*int*/ contextInfo) {
+public void beginSheetModalForWindow(NSWindow window, id delegate, long didEndSelector, long contextInfo) {
 	OS.objc_msgSend(this.id, OS.sel_beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_, window != null ? window.id : 0, delegate != null ? delegate.id : 0, didEndSelector, contextInfo);
 }
 
-public long /*int*/ runModal() {
+public long runModal() {
 	return OS.objc_msgSend(this.id, OS.sel_runModal);
 }
 
-public void setAlertStyle(long /*int*/ alertStyle) {
+public void setAlertStyle(long alertStyle) {
 	OS.objc_msgSend(this.id, OS.sel_setAlertStyle_, alertStyle);
 }
 
@@ -49,7 +49,7 @@ public void setMessageText(NSString messageText) {
 }
 
 public NSPanel window() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_window);
+	long result = OS.objc_msgSend(this.id, OS.sel_window);
 	return result != 0 ? new NSPanel(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppearance.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppearance.java
index 870f4b1ba2..a1c80b7bde 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppearance.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppearance.java
@@ -19,7 +19,7 @@ public NSAppearance() {
 	super();
 }
 
-public NSAppearance(long /*int*/ id) {
+public NSAppearance(long id) {
 	super(id);
 }
 
@@ -28,17 +28,17 @@ public NSAppearance(id id) {
 }
 
 public static NSAppearance appearanceNamed(NSString name) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSAppearance, OS.sel_appearanceNamed_, name != null ? name.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSAppearance, OS.sel_appearanceNamed_, name != null ? name.id : 0);
 	return result != 0 ? new NSAppearance(result) : null;
 }
 
 public static NSAppearance currentAppearance() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSAppearance, OS.sel_currentAppearance);
+	long result = OS.objc_msgSend(OS.class_NSAppearance, OS.sel_currentAppearance);
 	return result != 0 ? new NSAppearance(result) : null;
 }
 
 public NSString name() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_name);
+	long result = OS.objc_msgSend(this.id, OS.sel_name);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventDescriptor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventDescriptor.java
index 1af3d6c180..5dba222ba3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventDescriptor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAppleEventDescriptor.java
@@ -19,7 +19,7 @@ public NSAppleEventDescriptor() {
 	super();
 }
 
-public NSAppleEventDescriptor(long /*int*/ id) {
+public NSAppleEventDescriptor(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSAppleEventDescriptor(id id) {
 }
 
 public NSAppleEventDescriptor initListDescriptor() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initListDescriptor);
+	long result = OS.objc_msgSend(this.id, OS.sel_initListDescriptor);
 	return result == this.id ? this : (result != 0 ? new NSAppleEventDescriptor(result) : null);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java
index d648b10717..d9759d8242 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java
@@ -19,7 +19,7 @@ public NSApplication() {
 	super();
 }
 
-public NSApplication(long /*int*/ id) {
+public NSApplication(long id) {
 	super(id);
 }
 
@@ -32,7 +32,7 @@ public void activateIgnoringOtherApps(boolean flag) {
 }
 
 public NSImage applicationIconImage() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_applicationIconImage);
+	long result = OS.objc_msgSend(this.id, OS.sel_applicationIconImage);
 	return result != 0 ? new NSImage(result) : null;
 }
 
@@ -40,21 +40,21 @@ public void arrangeInFront(id sender) {
 	OS.objc_msgSend(this.id, OS.sel_arrangeInFront_, sender != null ? sender.id : 0);
 }
 
-public void beginSheet(NSWindow sheet, NSWindow docWindow, id modalDelegate, long /*int*/ didEndSelector, long /*int*/ contextInfo) {
+public void beginSheet(NSWindow sheet, NSWindow docWindow, id modalDelegate, long didEndSelector, long contextInfo) {
 	OS.objc_msgSend(this.id, OS.sel_beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_, sheet != null ? sheet.id : 0, docWindow != null ? docWindow.id : 0, modalDelegate != null ? modalDelegate.id : 0, didEndSelector, contextInfo);
 }
 
 public NSEvent currentEvent() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_currentEvent);
+	long result = OS.objc_msgSend(this.id, OS.sel_currentEvent);
 	return result != 0 ? new NSEvent(result) : null;
 }
 
 public NSDockTile dockTile() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dockTile);
+	long result = OS.objc_msgSend(this.id, OS.sel_dockTile);
 	return result != 0 ? new NSDockTile(result) : null;
 }
 
-public void endSheet(NSWindow sheet, long /*int*/ returnCode) {
+public void endSheet(NSWindow sheet, long returnCode) {
 	OS.objc_msgSend(this.id, OS.sel_endSheet_returnCode_, sheet != null ? sheet.id : 0, returnCode);
 }
 
@@ -79,22 +79,22 @@ public boolean isRunning() {
 }
 
 public NSWindow keyWindow() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_keyWindow);
+	long result = OS.objc_msgSend(this.id, OS.sel_keyWindow);
 	return result != 0 ? new NSWindow(result) : null;
 }
 
 public NSMenu mainMenu() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_mainMenu);
+	long result = OS.objc_msgSend(this.id, OS.sel_mainMenu);
 	return result != 0 ? new NSMenu(result) : null;
 }
 
 public NSWindow mainWindow() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_mainWindow);
+	long result = OS.objc_msgSend(this.id, OS.sel_mainWindow);
 	return result != 0 ? new NSWindow(result) : null;
 }
 
-public NSEvent nextEventMatchingMask(long /*int*/ mask, NSDate expiration, NSString mode, boolean deqFlag) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_nextEventMatchingMask_untilDate_inMode_dequeue_, mask, expiration != null ? expiration.id : 0, mode != null ? mode.id : 0, deqFlag);
+public NSEvent nextEventMatchingMask(long mask, NSDate expiration, NSString mode, boolean deqFlag) {
+	long result = OS.objc_msgSend(this.id, OS.sel_nextEventMatchingMask_untilDate_inMode_dequeue_, mask, expiration != null ? expiration.id : 0, mode != null ? mode.id : 0, deqFlag);
 	return result != 0 ? new NSEvent(result) : null;
 }
 
@@ -103,7 +103,7 @@ public void orderFrontStandardAboutPanel(id sender) {
 }
 
 public NSArray orderedWindows() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_orderedWindows);
+	long result = OS.objc_msgSend(this.id, OS.sel_orderedWindows);
 	return result != 0 ? new NSArray(result) : null;
 }
 
@@ -111,7 +111,7 @@ public void postEvent(NSEvent event, boolean flag) {
 	OS.objc_msgSend(this.id, OS.sel_postEvent_atStart_, event != null ? event.id : 0, flag);
 }
 
-public void replyToOpenOrPrint(long /*int*/ reply) {
+public void replyToOpenOrPrint(long reply) {
 	OS.objc_msgSend(this.id, OS.sel_replyToOpenOrPrint_, reply);
 }
 
@@ -119,11 +119,11 @@ public void run() {
 	OS.objc_msgSend(this.id, OS.sel_run);
 }
 
-public long /*int*/ runModalForWindow(NSWindow theWindow) {
+public long runModalForWindow(NSWindow theWindow) {
 	return OS.objc_msgSend(this.id, OS.sel_runModalForWindow_, theWindow != null ? theWindow.id : 0);
 }
 
-public boolean sendAction(long /*int*/ theAction, id theTarget, id sender) {
+public boolean sendAction(long theAction, id theTarget, id sender) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_sendAction_to_from_, theAction, theTarget != null ? theTarget.id : 0, sender != null ? sender.id : 0);
 }
 
@@ -131,7 +131,7 @@ public void sendEvent(NSEvent theEvent) {
 	OS.objc_msgSend(this.id, OS.sel_sendEvent_, theEvent != null ? theEvent.id : 0);
 }
 
-public boolean setActivationPolicy(long /*int*/ activationPolicy) {
+public boolean setActivationPolicy(long activationPolicy) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_setActivationPolicy_, activationPolicy);
 }
 
@@ -156,7 +156,7 @@ public void setServicesMenu(NSMenu servicesMenu) {
 }
 
 public static NSApplication sharedApplication() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSApplication, OS.sel_sharedApplication);
+	long result = OS.objc_msgSend(OS.class_NSApplication, OS.sel_sharedApplication);
 	return result != 0 ? new NSApplication(result) : null;
 }
 
@@ -176,13 +176,13 @@ public void unhideAllApplications(id sender) {
 	OS.objc_msgSend(this.id, OS.sel_unhideAllApplications_, sender != null ? sender.id : 0);
 }
 
-public NSWindow windowWithWindowNumber(long /*int*/ windowNum) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_windowWithWindowNumber_, windowNum);
+public NSWindow windowWithWindowNumber(long windowNum) {
+	long result = OS.objc_msgSend(this.id, OS.sel_windowWithWindowNumber_, windowNum);
 	return result != 0 ? new NSWindow(result) : null;
 }
 
 public NSArray windows() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_windows);
+	long result = OS.objc_msgSend(this.id, OS.sel_windows);
 	return result != 0 ? new NSArray(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArray.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArray.java
index 702ade9516..87c0e098b9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArray.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSArray.java
@@ -19,7 +19,7 @@ public NSArray() {
 	super();
 }
 
-public NSArray(long /*int*/ id) {
+public NSArray(long id) {
 	super(id);
 }
 
@@ -28,12 +28,12 @@ public NSArray(id id) {
 }
 
 public static NSArray array() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSArray, OS.sel_array);
+	long result = OS.objc_msgSend(OS.class_NSArray, OS.sel_array);
 	return result != 0 ? new NSArray(result) : null;
 }
 
 public static NSArray arrayWithObject(id anObject) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0);
 	return result != 0 ? new NSArray(result) : null;
 }
 
@@ -41,16 +41,16 @@ public boolean containsObject(id anObject) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_containsObject_, anObject != null ? anObject.id : 0);
 }
 
-public long /*int*/ count() {
+public long count() {
 	return OS.objc_msgSend(this.id, OS.sel_count);
 }
 
-public long /*int*/ indexOfObjectIdenticalTo(id anObject) {
+public long indexOfObjectIdenticalTo(id anObject) {
 	return OS.objc_msgSend(this.id, OS.sel_indexOfObjectIdenticalTo_, anObject != null ? anObject.id : 0);
 }
 
-public id objectAtIndex(long /*int*/ index) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectAtIndex_, index);
+public id objectAtIndex(long index) {
+	long result = OS.objc_msgSend(this.id, OS.sel_objectAtIndex_, index);
 	return result != 0 ? new id(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java
index 1596c1a457..6ddd32d9f3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAttributedString.java
@@ -19,7 +19,7 @@ public NSAttributedString() {
 	super();
 }
 
-public NSAttributedString(long /*int*/ id) {
+public NSAttributedString(long id) {
 	super(id);
 }
 
@@ -28,17 +28,17 @@ public NSAttributedString(id id) {
 }
 
 public static NSAttributedString attributedStringWithAttachment(NSTextAttachment attachment) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSAttributedString, OS.sel_attributedStringWithAttachment_, attachment != null ? attachment.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSAttributedString, OS.sel_attributedStringWithAttachment_, attachment != null ? attachment.id : 0);
 	return result != 0 ? new NSAttributedString(result) : null;
 }
 
-public NSRect boundingRectWithSize(NSSize size, long /*int*/ options) {
+public NSRect boundingRectWithSize(NSSize size, long options) {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_boundingRectWithSize_options_, size, options);
 	return result;
 }
 
-public NSRange doubleClickAtIndex(long /*int*/ location) {
+public NSRange doubleClickAtIndex(long location) {
 	NSRange result = new NSRange();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_doubleClickAtIndex_, location);
 	return result;
@@ -52,7 +52,7 @@ public void drawInRect(NSRect rect) {
 	OS.objc_msgSend(this.id, OS.sel_drawInRect_, rect);
 }
 
-public long /*int*/ nextWordFromIndex(long /*int*/ location, boolean isForward) {
+public long nextWordFromIndex(long location, boolean isForward) {
 	return OS.objc_msgSend(this.id, OS.sel_nextWordFromIndex_forward_, location, isForward);
 }
 
@@ -62,37 +62,37 @@ public NSSize size() {
 	return result;
 }
 
-public id attribute(NSString attrName, long /*int*/ location, long /*int*/ range) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_attribute_atIndex_effectiveRange_, attrName != null ? attrName.id : 0, location, range);
+public id attribute(NSString attrName, long location, long range) {
+	long result = OS.objc_msgSend(this.id, OS.sel_attribute_atIndex_effectiveRange_, attrName != null ? attrName.id : 0, location, range);
 	return result != 0 ? new id(result) : null;
 }
 
 public NSAttributedString attributedSubstringFromRange(NSRange range) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_attributedSubstringFromRange_, range);
+	long result = OS.objc_msgSend(this.id, OS.sel_attributedSubstringFromRange_, range);
 	return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null);
 }
 
-public NSDictionary attributesAtIndex(long /*int*/ location, long /*int*/ range, NSRange rangeLimit) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_attributesAtIndex_longestEffectiveRange_inRange_, location, range, rangeLimit);
+public NSDictionary attributesAtIndex(long location, long range, NSRange rangeLimit) {
+	long result = OS.objc_msgSend(this.id, OS.sel_attributesAtIndex_longestEffectiveRange_inRange_, location, range, rangeLimit);
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
 public NSAttributedString initWithString(NSString str) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithString_, str != null ? str.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithString_, str != null ? str.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null);
 }
 
 public NSAttributedString initWithString(NSString str, NSDictionary attrs) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithString_attributes_, str != null ? str.id : 0, attrs != null ? attrs.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithString_attributes_, str != null ? str.id : 0, attrs != null ? attrs.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSAttributedString(result) : null);
 }
 
-public long /*int*/ length() {
+public long length() {
 	return OS.objc_msgSend(this.id, OS.sel_length);
 }
 
 public NSString string() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_string);
+	long result = OS.objc_msgSend(this.id, OS.sel_string);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java
index 522a52c7a1..ed17773e1b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAutoreleasePool.java
@@ -19,7 +19,7 @@ public NSAutoreleasePool() {
 	super();
 }
 
-public NSAutoreleasePool(long /*int*/ id) {
+public NSAutoreleasePool(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBezierPath.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBezierPath.java
index e8f0e9f9a1..a63f51ae16 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBezierPath.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBezierPath.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSBezierPath() {
 	super();
 }
 
-public NSBezierPath(long /*int*/ id) {
+public NSBezierPath(long id) {
 	super(id);
 }
 
@@ -35,15 +35,15 @@ public void appendBezierPath(NSBezierPath path) {
 	OS.objc_msgSend(this.id, OS.sel_appendBezierPath_, path != null ? path.id : 0);
 }
 
-public void appendBezierPathWithArcWithCenter(NSPoint center, double /*float*/ radius, double /*float*/ startAngle, double /*float*/ endAngle) {
+public void appendBezierPathWithArcWithCenter(NSPoint center, double radius, double startAngle, double endAngle) {
 	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_, center, radius, startAngle, endAngle);
 }
 
-public void appendBezierPathWithArcWithCenter(NSPoint center, double /*float*/ radius, double /*float*/ startAngle, double /*float*/ endAngle, boolean clockwise) {
+public void appendBezierPathWithArcWithCenter(NSPoint center, double radius, double startAngle, double endAngle, boolean clockwise) {
 	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_, center, radius, startAngle, endAngle, clockwise);
 }
 
-public void appendBezierPathWithGlyphs(long /*int*/ glyphs, long /*int*/ count, NSFont font) {
+public void appendBezierPathWithGlyphs(long glyphs, long count, NSFont font) {
 	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithGlyphs_count_inFont_, glyphs, count, font != null ? font.id : 0);
 }
 
@@ -55,27 +55,27 @@ public void appendBezierPathWithRect(NSRect rect) {
 	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithRect_, rect);
 }
 
-public void appendBezierPathWithRoundedRect(NSRect rect, double /*float*/ xRadius, double /*float*/ yRadius) {
+public void appendBezierPathWithRoundedRect(NSRect rect, double xRadius, double yRadius) {
 	OS.objc_msgSend(this.id, OS.sel_appendBezierPathWithRoundedRect_xRadius_yRadius_, rect, xRadius, yRadius);
 }
 
 public static NSBezierPath bezierPath() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPath);
+	long result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPath);
 	return result != 0 ? new NSBezierPath(result) : null;
 }
 
 public NSBezierPath bezierPathByFlatteningPath() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_bezierPathByFlatteningPath);
+	long result = OS.objc_msgSend(this.id, OS.sel_bezierPathByFlatteningPath);
 	return result == this.id ? this : (result != 0 ? new NSBezierPath(result) : null);
 }
 
 public static NSBezierPath bezierPathWithRect(NSRect rect) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPathWithRect_, rect);
+	long result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPathWithRect_, rect);
 	return result != 0 ? new NSBezierPath(result) : null;
 }
 
-public static NSBezierPath bezierPathWithRoundedRect(NSRect rect, double /*float*/ xRadius, double /*float*/ yRadius) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPathWithRoundedRect_xRadius_yRadius_, rect, xRadius, yRadius);
+public static NSBezierPath bezierPathWithRoundedRect(NSRect rect, double xRadius, double yRadius) {
+	long result = OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_bezierPathWithRoundedRect_xRadius_yRadius_, rect, xRadius, yRadius);
 	return result != 0 ? new NSBezierPath(result) : null;
 }
 
@@ -109,15 +109,15 @@ public void curveToPoint(NSPoint endPoint, NSPoint controlPoint1, NSPoint contro
 	OS.objc_msgSend(this.id, OS.sel_curveToPoint_controlPoint1_controlPoint2_, endPoint, controlPoint1, controlPoint2);
 }
 
-public static double /*float*/ defaultFlatness() {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSBezierPath, OS.sel_defaultFlatness);
+public static double defaultFlatness() {
+	return OS.objc_msgSend_fpret(OS.class_NSBezierPath, OS.sel_defaultFlatness);
 }
 
-public long /*int*/ elementAtIndex(long /*int*/ index, long /*int*/ points) {
+public long elementAtIndex(long index, long points) {
 	return OS.objc_msgSend(this.id, OS.sel_elementAtIndex_associatedPoints_, index, points);
 }
 
-public long /*int*/ elementCount() {
+public long elementCount() {
 	return OS.objc_msgSend(this.id, OS.sel_elementCount);
 }
 
@@ -149,31 +149,31 @@ public void setClip() {
 	OS.objc_msgSend(this.id, OS.sel_setClip);
 }
 
-public static void setDefaultFlatness(double /*float*/ flatness) {
+public static void setDefaultFlatness(double flatness) {
 	OS.objc_msgSend(OS.class_NSBezierPath, OS.sel_setDefaultFlatness_, flatness);
 }
 
-public void setLineCapStyle(long /*int*/ lineCapStyle) {
+public void setLineCapStyle(long lineCapStyle) {
 	OS.objc_msgSend(this.id, OS.sel_setLineCapStyle_, lineCapStyle);
 }
 
-public void setLineDash(double[] /*float[]*/ pattern, long /*int*/ count, double /*float*/ phase) {
+public void setLineDash(double[] pattern, long count, double phase) {
 	OS.objc_msgSend(this.id, OS.sel_setLineDash_count_phase_, pattern, count, phase);
 }
 
-public void setLineJoinStyle(long /*int*/ lineJoinStyle) {
+public void setLineJoinStyle(long lineJoinStyle) {
 	OS.objc_msgSend(this.id, OS.sel_setLineJoinStyle_, lineJoinStyle);
 }
 
-public void setLineWidth(double /*float*/ lineWidth) {
+public void setLineWidth(double lineWidth) {
 	OS.objc_msgSend(this.id, OS.sel_setLineWidth_, lineWidth);
 }
 
-public void setMiterLimit(double /*float*/ miterLimit) {
+public void setMiterLimit(double miterLimit) {
 	OS.objc_msgSend(this.id, OS.sel_setMiterLimit_, miterLimit);
 }
 
-public void setWindingRule(long /*int*/ windingRule) {
+public void setWindingRule(long windingRule) {
 	OS.objc_msgSend(this.id, OS.sel_setWindingRule_, windingRule);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java
index 34e5f40d53..ef0d1ad139 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java
@@ -19,7 +19,7 @@ public NSBitmapImageRep() {
 	super();
 }
 
-public NSBitmapImageRep(long /*int*/ id) {
+public NSBitmapImageRep(long id) {
 	super(id);
 }
 
@@ -28,61 +28,61 @@ public NSBitmapImageRep(id id) {
 }
 
 public NSData TIFFRepresentation() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation);
+	long result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation);
 	return result != 0 ? new NSData(result) : null;
 }
 
-public long /*int*/ bitmapData() {
+public long bitmapData() {
 	return OS.objc_msgSend(this.id, OS.sel_bitmapData);
 }
 
-public long /*int*/ bitmapFormat() {
+public long bitmapFormat() {
 	return OS.objc_msgSend(this.id, OS.sel_bitmapFormat);
 }
 
-public long /*int*/ bitsPerPixel() {
+public long bitsPerPixel() {
 	return OS.objc_msgSend(this.id, OS.sel_bitsPerPixel);
 }
 
-public long /*int*/ bytesPerPlane() {
+public long bytesPerPlane() {
 	return OS.objc_msgSend(this.id, OS.sel_bytesPerPlane);
 }
 
-public long /*int*/ bytesPerRow() {
+public long bytesPerRow() {
 	return OS.objc_msgSend(this.id, OS.sel_bytesPerRow);
 }
 
-public NSColor colorAtX(long /*int*/ x, long /*int*/ y) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_colorAtX_y_, x, y);
+public NSColor colorAtX(long x, long y) {
+	long result = OS.objc_msgSend(this.id, OS.sel_colorAtX_y_, x, y);
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public void getBitmapDataPlanes(long[] /*int[]*/ data) {
+public void getBitmapDataPlanes(long[] data) {
 	OS.objc_msgSend(this.id, OS.sel_getBitmapDataPlanes_, data);
 }
 
 public static NSBitmapImageRep imageRepWithData(NSData data) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_imageRepWithData_, data != null ? data.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_imageRepWithData_, data != null ? data.id : 0);
 	return result != 0 ? new NSBitmapImageRep(result) : null;
 }
 
-public NSBitmapImageRep initWithBitmapDataPlanes(long /*int*/ planes, long /*int*/ width, long /*int*/ height, long /*int*/ bps, long /*int*/ spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, long /*int*/ bitmapFormat, long /*int*/ rBytes, long /*int*/ pBits) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, bitmapFormat, rBytes, pBits);
+public NSBitmapImageRep initWithBitmapDataPlanes(long planes, long width, long height, long bps, long spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, long bitmapFormat, long rBytes, long pBits) {
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, bitmapFormat, rBytes, pBits);
 	return result == this.id ? this : (result != 0 ? new NSBitmapImageRep(result) : null);
 }
 
-public NSBitmapImageRep initWithBitmapDataPlanes(long /*int*/ planes, long /*int*/ width, long /*int*/ height, long /*int*/ bps, long /*int*/ spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, long /*int*/ rBytes, long /*int*/ pBits) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, rBytes, pBits);
+public NSBitmapImageRep initWithBitmapDataPlanes(long planes, long width, long height, long bps, long spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, long rBytes, long pBits) {
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName != null ? colorSpaceName.id : 0, rBytes, pBits);
 	return result == this.id ? this : (result != 0 ? new NSBitmapImageRep(result) : null);
 }
 
 public NSBitmapImageRep initWithData(NSData data) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithData_, data != null ? data.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithData_, data != null ? data.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSBitmapImageRep(result) : null);
 }
 
 public NSBitmapImageRep initWithFocusedViewRect(NSRect rect) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFocusedViewRect_, rect);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithFocusedViewRect_, rect);
 	return result == this.id ? this : (result != 0 ? new NSBitmapImageRep(result) : null);
 }
 
@@ -90,16 +90,16 @@ public boolean isPlanar() {
 	return OS.objc_msgSend_bool(this.id, OS.sel_isPlanar);
 }
 
-public long /*int*/ numberOfPlanes() {
+public long numberOfPlanes() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfPlanes);
 }
 
-public long /*int*/ samplesPerPixel() {
+public long samplesPerPixel() {
 	return OS.objc_msgSend(this.id, OS.sel_samplesPerPixel);
 }
 
 public static NSImageRep imageRepWithContentsOfFile(NSString filename) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_imageRepWithContentsOfFile_, filename != null ? filename.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_imageRepWithContentsOfFile_, filename != null ? filename.id : 0);
 	return result != 0 ? new NSImageRep(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java
index ff87366157..c75e022fd6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2018 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSBox() {
 	super();
 }
 
-public NSBox(long /*int*/ id) {
+public NSBox(long id) {
 	super(id);
 }
 
@@ -27,12 +27,12 @@ public NSBox(id id) {
 	super(id);
 }
 
-public double /*float*/ borderWidth() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_borderWidth);
+public double borderWidth() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_borderWidth);
 }
 
 public NSView contentView() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_contentView);
+	long result = OS.objc_msgSend(this.id, OS.sel_contentView);
 	return result != 0 ? new NSView(result) : null;
 }
 
@@ -42,15 +42,15 @@ public NSSize contentViewMargins() {
 	return result;
 }
 
-public void setBorderType(long /*int*/ borderType) {
+public void setBorderType(long borderType) {
 	OS.objc_msgSend(this.id, OS.sel_setBorderType_, borderType);
 }
 
-public void setBorderWidth(double /*float*/ borderWidth) {
+public void setBorderWidth(double borderWidth) {
 	OS.objc_msgSend(this.id, OS.sel_setBorderWidth_, borderWidth);
 }
 
-public void setBoxType(long /*int*/ boxType) {
+public void setBoxType(long boxType) {
 	OS.objc_msgSend(this.id, OS.sel_setBoxType_, boxType);
 }
 
@@ -78,7 +78,7 @@ public void setTitleFont(NSFont titleFont) {
 	OS.objc_msgSend(this.id, OS.sel_setTitleFont_, titleFont != null ? titleFont.id : 0);
 }
 
-public void setTitlePosition(long /*int*/ titlePosition) {
+public void setTitlePosition(long titlePosition) {
 	OS.objc_msgSend(this.id, OS.sel_setTitlePosition_, titlePosition);
 }
 
@@ -87,12 +87,12 @@ public void sizeToFit() {
 }
 
 public NSCell titleCell() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_titleCell);
+	long result = OS.objc_msgSend(this.id, OS.sel_titleCell);
 	return result != 0 ? new NSCell(result) : null;
 }
 
 public NSFont titleFont() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_titleFont);
+	long result = OS.objc_msgSend(this.id, OS.sel_titleFont);
 	return result != 0 ? new NSFont(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java
index f6f4b55590..6f50d29002 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java
@@ -19,7 +19,7 @@ public NSBrowserCell() {
 	super();
 }
 
-public NSBrowserCell(long /*int*/ id) {
+public NSBrowserCell(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSBrowserCell(id id) {
 }
 
 public NSColor highlightColorInView(NSView controlView) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_highlightColorInView_, controlView != null ? controlView.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_highlightColorInView_, controlView != null ? controlView.id : 0);
 	return result != 0 ? new NSColor(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBundle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBundle.java
index 1316a2b3e9..70dca6b0bd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBundle.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBundle.java
@@ -19,7 +19,7 @@ public NSBundle() {
 	super();
 }
 
-public NSBundle(long /*int*/ id) {
+public NSBundle(long id) {
 	super(id);
 }
 
@@ -27,57 +27,57 @@ public NSBundle(id id) {
 	super(id);
 }
 
-public static boolean loadNibFile(NSString fileName, NSDictionary context, long /*int*/ zone) {
+public static boolean loadNibFile(NSString fileName, NSDictionary context, long zone) {
 	return OS.objc_msgSend_bool(OS.class_NSBundle, OS.sel_loadNibFile_externalNameTable_withZone_, fileName != null ? fileName.id : 0, context != null ? context.id : 0, zone);
 }
 
 public NSString bundleIdentifier() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_bundleIdentifier);
+	long result = OS.objc_msgSend(this.id, OS.sel_bundleIdentifier);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSString bundlePath() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_bundlePath);
+	long result = OS.objc_msgSend(this.id, OS.sel_bundlePath);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public static NSBundle bundleWithIdentifier(NSString identifier) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithIdentifier_, identifier != null ? identifier.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithIdentifier_, identifier != null ? identifier.id : 0);
 	return result != 0 ? new NSBundle(result) : null;
 }
 
 public static NSBundle bundleWithPath(NSString path) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithPath_, path != null ? path.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_bundleWithPath_, path != null ? path.id : 0);
 	return result != 0 ? new NSBundle(result) : null;
 }
 
 public NSDictionary infoDictionary() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_infoDictionary);
+	long result = OS.objc_msgSend(this.id, OS.sel_infoDictionary);
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
 public static NSBundle mainBundle() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_mainBundle);
+	long result = OS.objc_msgSend(OS.class_NSBundle, OS.sel_mainBundle);
 	return result != 0 ? new NSBundle(result) : null;
 }
 
 public id objectForInfoDictionaryKey(NSString key) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectForInfoDictionaryKey_, key != null ? key.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_objectForInfoDictionaryKey_, key != null ? key.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
 public NSString pathForResource(NSString name, NSString ext) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_pathForResource_ofType_, name != null ? name.id : 0, ext != null ? ext.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_pathForResource_ofType_, name != null ? name.id : 0, ext != null ? ext.id : 0);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSString pathForResource(NSString name, NSString ext, NSString subpath, NSString localizationName) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_pathForResource_ofType_inDirectory_forLocalization_, name != null ? name.id : 0, ext != null ? ext.id : 0, subpath != null ? subpath.id : 0, localizationName != null ? localizationName.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_pathForResource_ofType_inDirectory_forLocalization_, name != null ? name.id : 0, ext != null ? ext.id : 0, subpath != null ? subpath.id : 0, localizationName != null ? localizationName.id : 0);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSString resourcePath() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_resourcePath);
+	long result = OS.objc_msgSend(this.id, OS.sel_resourcePath);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java
index f199267a9a..0e38ca23bb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java
@@ -19,7 +19,7 @@ public NSButton() {
 	super();
 }
 
-public NSButton(long /*int*/ id) {
+public NSButton(long id) {
 	super(id);
 }
 
@@ -28,11 +28,11 @@ public NSButton(id id) {
 }
 
 public NSAttributedString attributedTitle() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
+	long result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
 	return result != 0 ? new NSAttributedString(result) : null;
 }
 
-public long /*int*/ bezelStyle() {
+public long bezelStyle() {
 	return OS.objc_msgSend(this.id, OS.sel_bezelStyle);
 }
 
@@ -44,7 +44,7 @@ public void setAttributedTitle(NSAttributedString attributedTitle) {
 	OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_, attributedTitle != null ? attributedTitle.id : 0);
 }
 
-public void setBezelStyle(long /*int*/ bezelStyle) {
+public void setBezelStyle(long bezelStyle) {
 	OS.objc_msgSend(this.id, OS.sel_setBezelStyle_, bezelStyle);
 }
 
@@ -52,7 +52,7 @@ public void setBordered(boolean bordered) {
 	OS.objc_msgSend(this.id, OS.sel_setBordered_, bordered);
 }
 
-public void setButtonType(long /*int*/ aType) {
+public void setButtonType(long aType) {
 	OS.objc_msgSend(this.id, OS.sel_setButtonType_, aType);
 }
 
@@ -60,7 +60,7 @@ public void setImage(NSImage image) {
 	OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0);
 }
 
-public void setImagePosition(long /*int*/ imagePosition) {
+public void setImagePosition(long imagePosition) {
 	OS.objc_msgSend(this.id, OS.sel_setImagePosition_, imagePosition);
 }
 
@@ -68,7 +68,7 @@ public void setKeyEquivalent(NSString keyEquivalent) {
 	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_, keyEquivalent != null ? keyEquivalent.id : 0);
 }
 
-public void setState(long /*int*/ state) {
+public void setState(long state) {
 	OS.objc_msgSend(this.id, OS.sel_setState_, state);
 }
 
@@ -76,15 +76,15 @@ public void setTitle(NSString title) {
 	OS.objc_msgSend(this.id, OS.sel_setTitle_, title != null ? title.id : 0);
 }
 
-public long /*int*/ state() {
+public long state() {
 	return OS.objc_msgSend(this.id, OS.sel_state);
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSButton, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSButton, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java
index e25c125d0f..2518b92104 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java
@@ -19,7 +19,7 @@ public NSButtonCell() {
 	super();
 }
 
-public NSButtonCell(long /*int*/ id) {
+public NSButtonCell(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSButtonCell(id id) {
 }
 
 public NSColor backgroundColor() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
+	long result = OS.objc_msgSend(this.id, OS.sel_backgroundColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
@@ -50,20 +50,20 @@ public void setBackgroundColor(NSColor backgroundColor) {
 	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, backgroundColor != null ? backgroundColor.id : 0);
 }
 
-public void setButtonType(long /*int*/ aType) {
+public void setButtonType(long aType) {
 	OS.objc_msgSend(this.id, OS.sel_setButtonType_, aType);
 }
 
-public void setHighlightsBy(long /*int*/ highlightsBy) {
+public void setHighlightsBy(long highlightsBy) {
 	OS.objc_msgSend(this.id, OS.sel_setHighlightsBy_, highlightsBy);
 }
 
-public void setImagePosition(long /*int*/ imagePosition) {
+public void setImagePosition(long imagePosition) {
 	OS.objc_msgSend(this.id, OS.sel_setImagePosition_, imagePosition);
 }
 
 public NSString title() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_title);
+	long result = OS.objc_msgSend(this.id, OS.sel_title);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java
index ce784578e2..35ab7cc13b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java
@@ -19,7 +19,7 @@ public NSCalendarDate() {
 	super();
 }
 
-public NSCalendarDate(long /*int*/ id) {
+public NSCalendarDate(long id) {
 	super(id);
 }
 
@@ -28,51 +28,51 @@ public NSCalendarDate(id id) {
 }
 
 public static NSCalendarDate calendarDate() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_calendarDate);
+	long result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_calendarDate);
 	return result != 0 ? new NSCalendarDate(result) : null;
 }
 
-public static NSCalendarDate dateWithYear(long /*int*/ year, long /*int*/ month, long /*int*/ day, long /*int*/ hour, long /*int*/ minute, long /*int*/ second, NSTimeZone aTimeZone) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithYear_month_day_hour_minute_second_timeZone_, year, month, day, hour, minute, second, aTimeZone != null ? aTimeZone.id : 0);
+public static NSCalendarDate dateWithYear(long year, long month, long day, long hour, long minute, long second, NSTimeZone aTimeZone) {
+	long result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithYear_month_day_hour_minute_second_timeZone_, year, month, day, hour, minute, second, aTimeZone != null ? aTimeZone.id : 0);
 	return result != 0 ? new NSCalendarDate(result) : null;
 }
 
-public long /*int*/ dayOfMonth() {
+public long dayOfMonth() {
 	return OS.objc_msgSend(this.id, OS.sel_dayOfMonth);
 }
 
-public long /*int*/ hourOfDay() {
+public long hourOfDay() {
 	return OS.objc_msgSend(this.id, OS.sel_hourOfDay);
 }
 
-public long /*int*/ minuteOfHour() {
+public long minuteOfHour() {
 	return OS.objc_msgSend(this.id, OS.sel_minuteOfHour);
 }
 
-public long /*int*/ monthOfYear() {
+public long monthOfYear() {
 	return OS.objc_msgSend(this.id, OS.sel_monthOfYear);
 }
 
-public long /*int*/ secondOfMinute() {
+public long secondOfMinute() {
 	return OS.objc_msgSend(this.id, OS.sel_secondOfMinute);
 }
 
 public NSTimeZone timeZone() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_timeZone);
+	long result = OS.objc_msgSend(this.id, OS.sel_timeZone);
 	return result != 0 ? new NSTimeZone(result) : null;
 }
 
-public long /*int*/ yearOfCommonEra() {
+public long yearOfCommonEra() {
 	return OS.objc_msgSend(this.id, OS.sel_yearOfCommonEra);
 }
 
 public static NSDate dateWithTimeIntervalSinceNow(double secs) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithTimeIntervalSinceNow_, secs);
+	long result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithTimeIntervalSinceNow_, secs);
 	return result != 0 ? new NSCalendarDate(result) : null;
 }
 
 public static NSDate distantFuture() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_distantFuture);
+	long result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_distantFuture);
 	return result != 0 ? new NSCalendarDate(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java
index 8c03eedf37..8d9c0ef03d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java
@@ -19,7 +19,7 @@ public NSCell() {
 	super();
 }
 
-public NSCell(long /*int*/ id) {
+public NSCell(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSCell(id id) {
 }
 
 public NSAttributedString attributedStringValue() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_attributedStringValue);
+	long result = OS.objc_msgSend(this.id, OS.sel_attributedStringValue);
 	return result != 0 ? new NSAttributedString(result) : null;
 }
 
@@ -44,7 +44,7 @@ public NSSize cellSizeForBounds(NSRect aRect) {
 	return result;
 }
 
-public long /*int*/ controlSize() {
+public long controlSize() {
 	return OS.objc_msgSend(this.id, OS.sel_controlSize);
 }
 
@@ -75,21 +75,21 @@ public NSRect focusRingMaskBoundsForFrame(NSRect cellFrame, NSView controlView)
 }
 
 public NSFont font() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_font);
+	long result = OS.objc_msgSend(this.id, OS.sel_font);
 	return result != 0 ? new NSFont(result) : null;
 }
 
 public NSColor highlightColorWithFrame(NSRect cellFrame, NSView controlView) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_highlightColorWithFrame_inView_, cellFrame, controlView != null ? controlView.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_highlightColorWithFrame_inView_, cellFrame, controlView != null ? controlView.id : 0);
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public long /*int*/ hitTestForEvent(NSEvent event, NSRect cellFrame, NSView controlView) {
+public long hitTestForEvent(NSEvent event, NSRect cellFrame, NSView controlView) {
 	return OS.objc_msgSend(this.id, OS.sel_hitTestForEvent_inRect_ofView_, event != null ? event.id : 0, cellFrame, controlView != null ? controlView.id : 0);
 }
 
 public NSImage image() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_image);
+	long result = OS.objc_msgSend(this.id, OS.sel_image);
 	return result != 0 ? new NSImage(result) : null;
 }
 
@@ -107,11 +107,11 @@ public boolean isHighlighted() {
 	return OS.objc_msgSend_bool(this.id, OS.sel_isHighlighted);
 }
 
-public long /*int*/ nextState() {
+public long nextState() {
 	return OS.objc_msgSend(this.id, OS.sel_nextState);
 }
 
-public void setAlignment(long /*int*/ alignment) {
+public void setAlignment(long alignment) {
 	OS.objc_msgSend(this.id, OS.sel_setAlignment_, alignment);
 }
 
@@ -123,15 +123,15 @@ public void setAttributedStringValue(NSAttributedString attributedStringValue) {
 	OS.objc_msgSend(this.id, OS.sel_setAttributedStringValue_, attributedStringValue != null ? attributedStringValue.id : 0);
 }
 
-public void setBackgroundStyle(long /*int*/ backgroundStyle) {
+public void setBackgroundStyle(long backgroundStyle) {
 	OS.objc_msgSend(this.id, OS.sel_setBackgroundStyle_, backgroundStyle);
 }
 
-public void setBaseWritingDirection(long /*int*/ baseWritingDirection) {
+public void setBaseWritingDirection(long baseWritingDirection) {
 	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, baseWritingDirection);
 }
 
-public void setControlSize(long /*int*/ controlSize) {
+public void setControlSize(long controlSize) {
 	OS.objc_msgSend(this.id, OS.sel_setControlSize_, controlSize);
 }
 
@@ -155,7 +155,7 @@ public void setImage(NSImage image) {
 	OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0);
 }
 
-public void setLineBreakMode(long /*int*/ lineBreakMode) {
+public void setLineBreakMode(long lineBreakMode) {
 	OS.objc_msgSend(this.id, OS.sel_setLineBreakMode_, lineBreakMode);
 }
 
@@ -180,7 +180,7 @@ public void setWraps(boolean wraps) {
 }
 
 public NSString title() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_title);
+	long result = OS.objc_msgSend(this.id, OS.sel_title);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java
index 541f3e5f87..2270b8df2c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java
@@ -19,7 +19,7 @@ public NSCharacterSet() {
 	super();
 }
 
-public NSCharacterSet(long /*int*/ id) {
+public NSCharacterSet(long id) {
 	super(id);
 }
 
@@ -32,7 +32,7 @@ public boolean characterIsMember(short aCharacter) {
 }
 
 public static NSCharacterSet decimalDigitCharacterSet() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_decimalDigitCharacterSet);
+	long result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_decimalDigitCharacterSet);
 	return result != 0 ? new NSCharacterSet(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java
index bb1ca6a856..7157643ba4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java
@@ -19,7 +19,7 @@ public NSClipView() {
 	super();
 }
 
-public NSClipView(long /*int*/ id) {
+public NSClipView(long id) {
 	super(id);
 }
 
@@ -32,7 +32,7 @@ public boolean copiesOnScroll() {
 }
 
 public NSCursor documentCursor() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_documentCursor);
+	long result = OS.objc_msgSend(this.id, OS.sel_documentCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCoder.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCoder.java
index 131200a39b..3acae26f22 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCoder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCoder.java
@@ -19,7 +19,7 @@ public NSCoder() {
 	super();
 }
 
-public NSCoder(long /*int*/ id) {
+public NSCoder(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSCoder(id id) {
 }
 
 public int systemVersion() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_systemVersion);
+	return (int)OS.objc_msgSend(this.id, OS.sel_systemVersion);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColor.java
index 27941b5f54..086972c078 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSColor() {
 	super();
 }
 
-public NSColor(long /*int*/ id) {
+public NSColor(long id) {
 	super(id);
 }
 
@@ -27,132 +27,132 @@ public NSColor(id id) {
 	super(id);
 }
 
-public double /*float*/ alphaComponent() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_alphaComponent);
+public double alphaComponent() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_alphaComponent);
 }
 
 public static NSColor alternateSelectedControlColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_alternateSelectedControlColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_alternateSelectedControlColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor alternateSelectedControlTextColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_alternateSelectedControlTextColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_alternateSelectedControlTextColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor blackColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_blackColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_blackColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public double /*float*/ blueComponent() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_blueComponent);
+public double blueComponent() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_blueComponent);
 }
 
 public static NSColor clearColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_clearColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_clearColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public NSColorSpace colorSpace() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_colorSpace);
+	long result = OS.objc_msgSend(this.id, OS.sel_colorSpace);
 	return result != 0 ? new NSColorSpace(result) : null;
 }
 
 public NSColor colorUsingColorSpaceName(NSString colorSpace) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_colorUsingColorSpaceName_, colorSpace != null ? colorSpace.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_colorUsingColorSpaceName_, colorSpace != null ? colorSpace.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSColor(result) : null);
 }
 
-public static NSColor colorWithCalibratedRed(double /*float*/ red, double /*float*/ green, double /*float*/ blue, double /*float*/ alpha) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithCalibratedRed_green_blue_alpha_, red, green, blue, alpha);
+public static NSColor colorWithCalibratedRed(double red, double green, double blue, double alpha) {
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithCalibratedRed_green_blue_alpha_, red, green, blue, alpha);
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public static NSColor colorWithDeviceRed(double /*float*/ red, double /*float*/ green, double /*float*/ blue, double /*float*/ alpha) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithDeviceRed_green_blue_alpha_, red, green, blue, alpha);
+public static NSColor colorWithDeviceRed(double red, double green, double blue, double alpha) {
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithDeviceRed_green_blue_alpha_, red, green, blue, alpha);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor colorWithPatternImage(NSImage image) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithPatternImage_, image != null ? image.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_colorWithPatternImage_, image != null ? image.id : 0);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor controlBackgroundColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlBackgroundColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlBackgroundColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor controlDarkShadowColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlDarkShadowColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlDarkShadowColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor controlHighlightColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlHighlightColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlHighlightColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor controlLightHighlightColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlLightHighlightColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlLightHighlightColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor controlShadowColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlShadowColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlShadowColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor controlTextColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlTextColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_controlTextColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor disabledControlTextColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_disabledControlTextColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_disabledControlTextColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public void getComponents(double[] /*float[]*/ components) {
+public void getComponents(double[] components) {
 	OS.objc_msgSend(this.id, OS.sel_getComponents_, components);
 }
 
-public double /*float*/ greenComponent() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_greenComponent);
+public double greenComponent() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_greenComponent);
 }
 
-public long /*int*/ numberOfComponents() {
+public long numberOfComponents() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfComponents);
 }
 
-public double /*float*/ redComponent() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_redComponent);
+public double redComponent() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_redComponent);
 }
 
 public static NSColor secondarySelectedControlColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_secondarySelectedControlColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_secondarySelectedControlColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor selectedControlColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedControlColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedControlColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor selectedControlTextColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedControlTextColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedControlTextColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor selectedTextBackgroundColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextBackgroundColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextBackgroundColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor selectedTextColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_selectedTextColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
@@ -169,27 +169,27 @@ public void setStroke() {
 }
 
 public static NSColor textBackgroundColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textBackgroundColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textBackgroundColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor textColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_textColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor windowBackgroundColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowBackgroundColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowBackgroundColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor windowFrameColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowFrameColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowFrameColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public static NSColor windowFrameTextColor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowFrameTextColor);
+	long result = OS.objc_msgSend(OS.class_NSColor, OS.sel_windowFrameTextColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java
index fb3f3d9f11..83e1adfde4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java
@@ -19,7 +19,7 @@ public NSColorList() {
 	super();
 }
 
-public NSColorList(long /*int*/ id) {
+public NSColorList(long id) {
 	super(id);
 }
 
@@ -28,26 +28,26 @@ public NSColorList(id id) {
 }
 
 public NSArray allKeys() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_allKeys);
+	long result = OS.objc_msgSend(this.id, OS.sel_allKeys);
 	return result != 0 ? new NSArray(result) : null;
 }
 
 public static NSColorList colorListNamed(NSString name) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColorList, OS.sel_colorListNamed_, name != null ? name.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSColorList, OS.sel_colorListNamed_, name != null ? name.id : 0);
 	return result != 0 ? new NSColorList(result) : null;
 }
 
 public NSColor colorWithKey(NSString key) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_colorWithKey_, key != null ? key.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_colorWithKey_, key != null ? key.id : 0);
 	return result != 0 ? new NSColor(result) : null;
 }
 
 public NSColorList initWithName(NSString name) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithName_, name != null ? name.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithName_, name != null ? name.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSColorList(result) : null);
 }
 
-public void insertColor(NSColor color, NSString key, long /*int*/ loc) {
+public void insertColor(NSColor color, NSString key, long loc) {
 	OS.objc_msgSend(this.id, OS.sel_insertColor_key_atIndex_, color != null ? color.id : 0, key != null ? key.id : 0, loc);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPanel.java
index 50e9f84c03..e4aef152f4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorPanel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSColorPanel() {
 	super();
 }
 
-public NSColorPanel(long /*int*/ id) {
+public NSColorPanel(long id) {
 	super(id);
 }
 
@@ -32,7 +32,7 @@ public void attachColorList(NSColorList colorList) {
 }
 
 public NSColor color() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_color);
+	long result = OS.objc_msgSend(this.id, OS.sel_color);
 	return result != 0 ? new NSColor(result) : null;
 }
 
@@ -41,15 +41,15 @@ public void setColor(NSColor color) {
 }
 
 public static NSColorPanel sharedColorPanel() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColorPanel, OS.sel_sharedColorPanel);
+	long result = OS.objc_msgSend(OS.class_NSColorPanel, OS.sel_sharedColorPanel);
 	return result != 0 ? new NSColorPanel(result) : null;
 }
 
-public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSColorPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double minFrameWidthWithTitle(NSString aTitle, long aStyle) {
+	return OS.objc_msgSend_fpret(OS.class_NSColorPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
-public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
+public static long windowNumberAtPoint(NSPoint point, long windowNumber) {
 	return OS.objc_msgSend(OS.class_NSColorPanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorSpace.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorSpace.java
index 29ede062b7..8448a3f450 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorSpace.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorSpace.java
@@ -19,7 +19,7 @@ public NSColorSpace() {
 	super();
 }
 
-public NSColorSpace(long /*int*/ id) {
+public NSColorSpace(long id) {
 	super(id);
 }
 
@@ -27,12 +27,12 @@ public NSColorSpace(id id) {
 	super(id);
 }
 
-public long /*int*/ colorSpaceModel() {
+public long colorSpaceModel() {
 	return OS.objc_msgSend(this.id, OS.sel_colorSpaceModel);
 }
 
 public static NSColorSpace genericRGBColorSpace() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_genericRGBColorSpace);
+	long result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_genericRGBColorSpace);
 	return result != 0 ? new NSColorSpace(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java
index 2cb6f94f3b..60cdbd0e05 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSComboBox() {
 	super();
 }
 
-public NSComboBox(long /*int*/ id) {
+public NSComboBox(long id) {
 	super(id);
 }
 
@@ -31,32 +31,32 @@ public void addItemWithObjectValue(id object) {
 	OS.objc_msgSend(this.id, OS.sel_addItemWithObjectValue_, object != null ? object.id : 0);
 }
 
-public void deselectItemAtIndex(long /*int*/ index) {
+public void deselectItemAtIndex(long index) {
 	OS.objc_msgSend(this.id, OS.sel_deselectItemAtIndex_, index);
 }
 
-public long /*int*/ indexOfSelectedItem() {
+public long indexOfSelectedItem() {
 	return OS.objc_msgSend(this.id, OS.sel_indexOfSelectedItem);
 }
 
-public void insertItemWithObjectValue(id object, long /*int*/ index) {
+public void insertItemWithObjectValue(id object, long index) {
 	OS.objc_msgSend(this.id, OS.sel_insertItemWithObjectValue_atIndex_, object != null ? object.id : 0, index);
 }
 
-public double /*float*/ itemHeight() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_itemHeight);
+public double itemHeight() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_itemHeight);
 }
 
-public id itemObjectValueAtIndex(long /*int*/ index) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemObjectValueAtIndex_, index);
+public id itemObjectValueAtIndex(long index) {
+	long result = OS.objc_msgSend(this.id, OS.sel_itemObjectValueAtIndex_, index);
 	return result != 0 ? new id(result) : null;
 }
 
-public long /*int*/ numberOfItems() {
+public long numberOfItems() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfItems);
 }
 
-public long /*int*/ numberOfVisibleItems() {
+public long numberOfVisibleItems() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfVisibleItems);
 }
 
@@ -64,23 +64,23 @@ public void removeAllItems() {
 	OS.objc_msgSend(this.id, OS.sel_removeAllItems);
 }
 
-public void removeItemAtIndex(long /*int*/ index) {
+public void removeItemAtIndex(long index) {
 	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
 }
 
-public void selectItemAtIndex(long /*int*/ index) {
+public void selectItemAtIndex(long index) {
 	OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_, index);
 }
 
-public void setNumberOfVisibleItems(long /*int*/ numberOfVisibleItems) {
+public void setNumberOfVisibleItems(long numberOfVisibleItems) {
 	OS.objc_msgSend(this.id, OS.sel_setNumberOfVisibleItems_, numberOfVisibleItems);
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSComboBox, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSComboBox, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBoxCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBoxCell.java
index 28e94ae105..634c637bd8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBoxCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBoxCell.java
@@ -19,7 +19,7 @@ public NSComboBoxCell() {
 	super();
 }
 
-public NSComboBoxCell(long /*int*/ id) {
+public NSComboBoxCell(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSComboBoxCell(id id) {
 }
 
 public NSArray objectValues() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectValues);
+	long result = OS.objc_msgSend(this.id, OS.sel_objectValues);
 	return result != 0 ? new NSArray(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java
index 8e7a42a13a..298810a8ab 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java
@@ -19,7 +19,7 @@ public NSControl() {
 	super();
 }
 
-public NSControl(long /*int*/ id) {
+public NSControl(long id) {
 	super(id);
 }
 
@@ -31,21 +31,21 @@ public boolean abortEditing() {
 	return OS.objc_msgSend_bool(this.id, OS.sel_abortEditing);
 }
 
-public long /*int*/ action() {
+public long action() {
 	return OS.objc_msgSend(this.id, OS.sel_action);
 }
 
 public NSCell cell() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_cell);
+	long result = OS.objc_msgSend(this.id, OS.sel_cell);
 	return result != 0 ? new NSCell(result) : null;
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSControl, OS.sel_cellClass);
 }
 
 public NSText currentEditor() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_currentEditor);
+	long result = OS.objc_msgSend(this.id, OS.sel_currentEditor);
 	return result != 0 ? new NSText(result) : null;
 }
 
@@ -54,7 +54,7 @@ public double doubleValue() {
 }
 
 public NSFont font() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_font);
+	long result = OS.objc_msgSend(this.id, OS.sel_font);
 	return result != 0 ? new NSFont(result) : null;
 }
 
@@ -66,19 +66,19 @@ public boolean isHighlighted() {
 	return OS.objc_msgSend_bool(this.id, OS.sel_isHighlighted);
 }
 
-public boolean sendAction(long /*int*/ theAction, id theTarget) {
+public boolean sendAction(long theAction, id theTarget) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_sendAction_to_, theAction, theTarget != null ? theTarget.id : 0);
 }
 
-public void setAction(long /*int*/ action) {
+public void setAction(long action) {
 	OS.objc_msgSend(this.id, OS.sel_setAction_, action);
 }
 
-public void setAlignment(long /*int*/ alignment) {
+public void setAlignment(long alignment) {
 	OS.objc_msgSend(this.id, OS.sel_setAlignment_, alignment);
 }
 
-public void setBaseWritingDirection(long /*int*/ baseWritingDirection) {
+public void setBaseWritingDirection(long baseWritingDirection) {
 	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, baseWritingDirection);
 }
 
@@ -86,7 +86,7 @@ public void setCell(NSCell cell) {
 	OS.objc_msgSend(this.id, OS.sel_setCell_, cell != null ? cell.id : 0);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSControl, OS.sel_setCellClass_, factoryId);
 }
 
@@ -119,12 +119,12 @@ public void sizeToFit() {
 }
 
 public NSString stringValue() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringValue);
+	long result = OS.objc_msgSend(this.id, OS.sel_stringValue);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public id target() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_target);
+	long result = OS.objc_msgSend(this.id, OS.sel_target);
 	return result != 0 ? new id(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCursor.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCursor.java
index 3960fb5d21..d289c31cdd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCursor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCursor.java
@@ -19,7 +19,7 @@ public NSCursor() {
 	super();
 }
 
-public NSCursor(long /*int*/ id) {
+public NSCursor(long id) {
 	super(id);
 }
 
@@ -28,22 +28,22 @@ public NSCursor(id id) {
 }
 
 public static NSCursor IBeamCursor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_IBeamCursor);
+	long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_IBeamCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
 public static NSCursor arrowCursor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_arrowCursor);
+	long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_arrowCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
 public static NSCursor crosshairCursor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_crosshairCursor);
+	long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_crosshairCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
 public static NSCursor currentCursor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_currentCursor);
+	long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_currentCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
@@ -54,17 +54,17 @@ public NSPoint hotSpot() {
 }
 
 public NSCursor initWithImage(NSImage newImage, NSPoint aPoint) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithImage_hotSpot_, newImage != null ? newImage.id : 0, aPoint);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithImage_hotSpot_, newImage != null ? newImage.id : 0, aPoint);
 	return result == this.id ? this : (result != 0 ? new NSCursor(result) : null);
 }
 
 public static NSCursor operationNotAllowedCursor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_operationNotAllowedCursor);
+	long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_operationNotAllowedCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
 public static NSCursor pointingHandCursor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_pointingHandCursor);
+	long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_pointingHandCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
@@ -77,32 +77,32 @@ public void push() {
 }
 
 public static NSCursor resizeDownCursor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeDownCursor);
+	long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeDownCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
 public static NSCursor resizeLeftCursor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeLeftCursor);
+	long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeLeftCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
 public static NSCursor resizeLeftRightCursor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeLeftRightCursor);
+	long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeLeftRightCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
 public static NSCursor resizeRightCursor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeRightCursor);
+	long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeRightCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
 public static NSCursor resizeUpCursor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeUpCursor);
+	long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeUpCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
 public static NSCursor resizeUpDownCursor() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeUpDownCursor);
+	long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_resizeUpDownCursor);
 	return result != 0 ? new NSCursor(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSData.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSData.java
index 5dc68e8655..a850655d6d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSData.java
@@ -19,7 +19,7 @@ public NSData() {
 	super();
 }
 
-public NSData(long /*int*/ id) {
+public NSData(long id) {
 	super(id);
 }
 
@@ -27,12 +27,12 @@ public NSData(id id) {
 	super(id);
 }
 
-public long /*int*/ bytes() {
+public long bytes() {
 	return OS.objc_msgSend(this.id, OS.sel_bytes);
 }
 
-public static NSData dataWithBytes(byte[] bytes, long /*int*/ length) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithBytes_length_, bytes, length);
+public static NSData dataWithBytes(byte[] bytes, long length) {
+	long result = OS.objc_msgSend(OS.class_NSData, OS.sel_dataWithBytes_length_, bytes, length);
 	return result != 0 ? new NSData(result) : null;
 }
 
@@ -40,11 +40,11 @@ public void getBytes(byte[] buffer) {
 	OS.objc_msgSend(this.id, OS.sel_getBytes_, buffer);
 }
 
-public void getBytes(long /*int*/ buffer, long /*int*/ length) {
+public void getBytes(long buffer, long length) {
 	OS.objc_msgSend(this.id, OS.sel_getBytes_length_, buffer, length);
 }
 
-public long /*int*/ length() {
+public long length() {
 	return OS.objc_msgSend(this.id, OS.sel_length);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDate.java
index 8c7edab746..9a602dd104 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDate.java
@@ -19,7 +19,7 @@ public NSDate() {
 	super();
 }
 
-public NSDate(long /*int*/ id) {
+public NSDate(long id) {
 	super(id);
 }
 
@@ -28,17 +28,17 @@ public NSDate(id id) {
 }
 
 public NSCalendarDate dateWithCalendarFormat(NSString format, NSTimeZone aTimeZone) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dateWithCalendarFormat_timeZone_, format != null ? format.id : 0, aTimeZone != null ? aTimeZone.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_dateWithCalendarFormat_timeZone_, format != null ? format.id : 0, aTimeZone != null ? aTimeZone.id : 0);
 	return result != 0 ? new NSCalendarDate(result) : null;
 }
 
 public static NSDate dateWithTimeIntervalSinceNow(double secs) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithTimeIntervalSinceNow_, secs);
+	long result = OS.objc_msgSend(OS.class_NSDate, OS.sel_dateWithTimeIntervalSinceNow_, secs);
 	return result != 0 ? new NSDate(result) : null;
 }
 
 public static NSDate distantFuture() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSDate, OS.sel_distantFuture);
+	long result = OS.objc_msgSend(OS.class_NSDate, OS.sel_distantFuture);
 	return result != 0 ? new NSDate(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java
index 9d13272558..6ecf6bf442 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java
@@ -19,7 +19,7 @@ public NSDatePicker() {
 	super();
 }
 
-public NSDatePicker(long /*int*/ id) {
+public NSDatePicker(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSDatePicker(id id) {
 }
 
 public NSDate dateValue() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dateValue);
+	long result = OS.objc_msgSend(this.id, OS.sel_dateValue);
 	return result != 0 ? new NSDate(result) : null;
 }
 
@@ -44,11 +44,11 @@ public void setBordered(boolean bordered) {
 	OS.objc_msgSend(this.id, OS.sel_setBordered_, bordered);
 }
 
-public void setDatePickerElements(long /*int*/ datePickerElements) {
+public void setDatePickerElements(long datePickerElements) {
 	OS.objc_msgSend(this.id, OS.sel_setDatePickerElements_, datePickerElements);
 }
 
-public void setDatePickerStyle(long /*int*/ datePickerStyle) {
+public void setDatePickerStyle(long datePickerStyle) {
 	OS.objc_msgSend(this.id, OS.sel_setDatePickerStyle_, datePickerStyle);
 }
 
@@ -64,11 +64,11 @@ public void setTextColor(NSColor textColor) {
 	OS.objc_msgSend(this.id, OS.sel_setTextColor_, textColor != null ? textColor.id : 0);
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSDatePicker, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSDatePicker, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java
index ab69fcb853..d3ea7dcef6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java
@@ -19,7 +19,7 @@ public NSDictionary() {
 	super();
 }
 
-public NSDictionary(long /*int*/ id) {
+public NSDictionary(long id) {
 	super(id);
 }
 
@@ -28,31 +28,31 @@ public NSDictionary(id id) {
 }
 
 public NSArray allKeys() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_allKeys);
+	long result = OS.objc_msgSend(this.id, OS.sel_allKeys);
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public long /*int*/ count() {
+public long count() {
 	return OS.objc_msgSend(this.id, OS.sel_count);
 }
 
 public static NSDictionary dictionaryWithObject(id object, id key) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0);
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
 public NSEnumerator objectEnumerator() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
+	long result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
 	return result != 0 ? new NSEnumerator(result) : null;
 }
 
 public id objectForKey(id aKey) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectForKey_, aKey != null ? aKey.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_objectForKey_, aKey != null ? aKey.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
 public id valueForKey(NSString key) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_valueForKey_, key != null ? key.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_valueForKey_, key != null ? key.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDirectoryEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDirectoryEnumerator.java
index d3c31be870..2932246e94 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDirectoryEnumerator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDirectoryEnumerator.java
@@ -19,7 +19,7 @@ public NSDirectoryEnumerator() {
 	super();
 }
 
-public NSDirectoryEnumerator(long /*int*/ id) {
+public NSDirectoryEnumerator(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java
index 9fb5d6c15e..7912dc0b28 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java
@@ -19,7 +19,7 @@ public NSDockTile() {
 	super();
 }
 
-public NSDockTile(long /*int*/ id) {
+public NSDockTile(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSDockTile(id id) {
 }
 
 public NSString badgeLabel() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_badgeLabel);
+	long result = OS.objc_msgSend(this.id, OS.sel_badgeLabel);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEnumerator.java
index fbf74fa756..99b9aea4c5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEnumerator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEnumerator.java
@@ -19,7 +19,7 @@ public NSEnumerator() {
 	super();
 }
 
-public NSEnumerator(long /*int*/ id) {
+public NSEnumerator(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSEnumerator(id id) {
 }
 
 public id nextObject() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_nextObject);
+	long result = OS.objc_msgSend(this.id, OS.sel_nextObject);
 	return result != 0 ? new id(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSError.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSError.java
index fe48736e7e..850b83bd67 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSError.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSError.java
@@ -19,7 +19,7 @@ public NSError() {
 	super();
 }
 
-public NSError(long /*int*/ id) {
+public NSError(long id) {
 	super(id);
 }
 
@@ -27,17 +27,17 @@ public NSError(id id) {
 	super(id);
 }
 
-public long /*int*/ code() {
+public long code() {
 	return OS.objc_msgSend(this.id, OS.sel_code);
 }
 
 public NSString localizedDescription() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_localizedDescription);
+	long result = OS.objc_msgSend(this.id, OS.sel_localizedDescription);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSDictionary userInfo() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo);
+	long result = OS.objc_msgSend(this.id, OS.sel_userInfo);
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java
index 481e1d00fc..789b1ac266 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSEvent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSEvent() {
 	super();
 }
 
-public NSEvent(long /*int*/ id) {
+public NSEvent(long id) {
 	super(id);
 }
 
@@ -27,38 +27,38 @@ public NSEvent(id id) {
 	super(id);
 }
 
-public long /*int*/ CGEvent() {
+public long CGEvent() {
 	return OS.objc_msgSend(this.id, OS.sel_CGEvent);
 }
 
-public long /*int*/ buttonNumber() {
+public long buttonNumber() {
 	return OS.objc_msgSend(this.id, OS.sel_buttonNumber);
 }
 
 public NSString characters() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_characters);
+	long result = OS.objc_msgSend(this.id, OS.sel_characters);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSString charactersIgnoringModifiers() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_charactersIgnoringModifiers);
+	long result = OS.objc_msgSend(this.id, OS.sel_charactersIgnoringModifiers);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public long /*int*/ clickCount() {
+public long clickCount() {
 	return OS.objc_msgSend(this.id, OS.sel_clickCount);
 }
 
-public double /*float*/ deltaX() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_deltaX);
+public double deltaX() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_deltaX);
 }
 
-public double /*float*/ deltaY() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_deltaY);
+public double deltaY() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_deltaY);
 }
 
-public static NSEvent enterExitEventWithType(long /*int*/ type, NSPoint location, long /*int*/ flags, double time, long /*int*/ wNum, NSGraphicsContext context, long /*int*/ eNum, long /*int*/ tNum, long /*int*/ data) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_enterExitEventWithType_location_modifierFlags_timestamp_windowNumber_context_eventNumber_trackingNumber_userData_, type, location, flags, time, wNum, context != null ? context.id : 0, eNum, tNum, data);
+public static NSEvent enterExitEventWithType(long type, NSPoint location, long flags, double time, long wNum, NSGraphicsContext context, long eNum, long tNum, long data) {
+	long result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_enterExitEventWithType_location_modifierFlags_timestamp_windowNumber_context_eventNumber_trackingNumber_userData_, type, location, flags, time, wNum, context != null ? context.id : 0, eNum, tNum, data);
 	return result != 0 ? new NSEvent(result) : null;
 }
 
@@ -72,11 +72,11 @@ public NSPoint locationInWindow() {
 	return result;
 }
 
-public double /*float*/ magnification() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_magnification);
+public double magnification() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_magnification);
 }
 
-public long /*int*/ modifierFlags() {
+public long modifierFlags() {
 	return OS.objc_msgSend(this.id, OS.sel_modifierFlags);
 }
 
@@ -86,8 +86,8 @@ public static NSPoint mouseLocation() {
 	return result;
 }
 
-public static NSEvent otherEventWithType(long /*int*/ type, NSPoint location, long /*int*/ flags, double time, long /*int*/ wNum, NSGraphicsContext context, short subtype, long /*int*/ d1, long /*int*/ d2) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_, type, location, flags, time, wNum, context != null ? context.id : 0, subtype, d1, d2);
+public static NSEvent otherEventWithType(long type, NSPoint location, long flags, double time, long wNum, NSGraphicsContext context, short subtype, long d1, long d2) {
+	long result = OS.objc_msgSend(OS.class_NSEvent, OS.sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_, type, location, flags, time, wNum, context != null ? context.id : 0, subtype, d1, d2);
 	return result != 0 ? new NSEvent(result) : null;
 }
 
@@ -99,17 +99,17 @@ public double timestamp() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_timestamp);
 }
 
-public NSSet touchesMatchingPhase(long /*int*/ phase, NSView view) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_touchesMatchingPhase_inView_, phase, view != null ? view.id : 0);
+public NSSet touchesMatchingPhase(long phase, NSView view) {
+	long result = OS.objc_msgSend(this.id, OS.sel_touchesMatchingPhase_inView_, phase, view != null ? view.id : 0);
 	return result != 0 ? new NSSet(result) : null;
 }
 
-public long /*int*/ type() {
+public long type() {
 	return OS.objc_msgSend(this.id, OS.sel_type);
 }
 
 public NSWindow window() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_window);
+	long result = OS.objc_msgSend(this.id, OS.sel_window);
 	return result != 0 ? new NSWindow(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java
index d0bdcdca6d..6356a12599 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileManager.java
@@ -19,7 +19,7 @@ public NSFileManager() {
 	super();
 }
 
-public NSFileManager(long /*int*/ id) {
+public NSFileManager(long id) {
 	super(id);
 }
 
@@ -27,8 +27,8 @@ public NSFileManager(id id) {
 	super(id);
 }
 
-public NSArray URLsForDirectory(long /*int*/ directory, long /*int*/ domainMask) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_URLsForDirectory_inDomains_, directory, domainMask);
+public NSArray URLsForDirectory(long directory, long domainMask) {
+	long result = OS.objc_msgSend(this.id, OS.sel_URLsForDirectory_inDomains_, directory, domainMask);
 	return result != 0 ? new NSArray(result) : null;
 }
 
@@ -37,12 +37,12 @@ public boolean createFileAtPath(NSString path, NSData data, NSDictionary attr) {
 }
 
 public static NSFileManager defaultManager() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSFileManager, OS.sel_defaultManager);
+	long result = OS.objc_msgSend(OS.class_NSFileManager, OS.sel_defaultManager);
 	return result != 0 ? new NSFileManager(result) : null;
 }
 
 public NSDirectoryEnumerator enumeratorAtPath(NSString path) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_enumeratorAtPath_, path != null ? path.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_enumeratorAtPath_, path != null ? path.id : 0);
 	return result != 0 ? new NSDirectoryEnumerator(result) : null;
 }
 
@@ -50,7 +50,7 @@ public boolean fileExistsAtPath(NSString path) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_fileExistsAtPath_, path != null ? path.id : 0);
 }
 
-public boolean fileExistsAtPath(NSString path, long /*int*/ isDirectory) {
+public boolean fileExistsAtPath(NSString path, long isDirectory) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_fileExistsAtPath_isDirectory_, path != null ? path.id : 0, isDirectory);
 }
 
@@ -58,7 +58,7 @@ public boolean isExecutableFileAtPath(NSString path) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_isExecutableFileAtPath_, path != null ? path.id : 0);
 }
 
-public boolean removeItemAtPath(NSString path, long /*int*/ error) {
+public boolean removeItemAtPath(NSString path, long error) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_removeItemAtPath_error_, path != null ? path.id : 0, error);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileWrapper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileWrapper.java
index f83a25192b..473480955a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileWrapper.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFileWrapper.java
@@ -19,7 +19,7 @@ public NSFileWrapper() {
 	super();
 }
 
-public NSFileWrapper(long /*int*/ id) {
+public NSFileWrapper(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFont.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFont.java
index c6120f448d..fa1c251579 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFont.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFont.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSFont() {
 	super();
 }
 
-public NSFont(long /*int*/ id) {
+public NSFont(long id) {
 	super(id);
 }
 
@@ -27,77 +27,77 @@ public NSFont(id id) {
 	super(id);
 }
 
-public double /*float*/ ascender() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_ascender);
+public double ascender() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_ascender);
 }
 
-public static NSFont boldSystemFontOfSize(double /*float*/ fontSize) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_boldSystemFontOfSize_, fontSize);
+public static NSFont boldSystemFontOfSize(double fontSize) {
+	long result = OS.objc_msgSend(OS.class_NSFont, OS.sel_boldSystemFontOfSize_, fontSize);
 	return result != 0 ? new NSFont(result) : null;
 }
 
-public static NSFont controlContentFontOfSize(double /*float*/ fontSize) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_controlContentFontOfSize_, fontSize);
+public static NSFont controlContentFontOfSize(double fontSize) {
+	long result = OS.objc_msgSend(OS.class_NSFont, OS.sel_controlContentFontOfSize_, fontSize);
 	return result != 0 ? new NSFont(result) : null;
 }
 
-public double /*float*/ descender() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_descender);
+public double descender() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_descender);
 }
 
 public NSString displayName() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_displayName);
+	long result = OS.objc_msgSend(this.id, OS.sel_displayName);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSString familyName() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_familyName);
+	long result = OS.objc_msgSend(this.id, OS.sel_familyName);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSString fontName() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_fontName);
+	long result = OS.objc_msgSend(this.id, OS.sel_fontName);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public static NSFont fontWithName(NSString fontName, double /*float*/ fontSize) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_fontWithName_size_, fontName != null ? fontName.id : 0, fontSize);
+public static NSFont fontWithName(NSString fontName, double fontSize) {
+	long result = OS.objc_msgSend(OS.class_NSFont, OS.sel_fontWithName_size_, fontName != null ? fontName.id : 0, fontSize);
 	return result != 0 ? new NSFont(result) : null;
 }
 
-public double /*float*/ leading() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_leading);
+public double leading() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_leading);
 }
 
-public static NSFont menuBarFontOfSize(double /*float*/ fontSize) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_menuBarFontOfSize_, fontSize);
+public static NSFont menuBarFontOfSize(double fontSize) {
+	long result = OS.objc_msgSend(OS.class_NSFont, OS.sel_menuBarFontOfSize_, fontSize);
 	return result != 0 ? new NSFont(result) : null;
 }
 
-public static NSFont menuFontOfSize(double /*float*/ fontSize) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_menuFontOfSize_, fontSize);
+public static NSFont menuFontOfSize(double fontSize) {
+	long result = OS.objc_msgSend(OS.class_NSFont, OS.sel_menuFontOfSize_, fontSize);
 	return result != 0 ? new NSFont(result) : null;
 }
 
-public double /*float*/ pointSize() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_pointSize);
+public double pointSize() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_pointSize);
 }
 
-public static double /*float*/ smallSystemFontSize() {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_smallSystemFontSize);
+public static double smallSystemFontSize() {
+	return OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_smallSystemFontSize);
 }
 
-public static NSFont systemFontOfSize(double /*float*/ fontSize) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSFont, OS.sel_systemFontOfSize_, fontSize);
+public static NSFont systemFontOfSize(double fontSize) {
+	long result = OS.objc_msgSend(OS.class_NSFont, OS.sel_systemFontOfSize_, fontSize);
 	return result != 0 ? new NSFont(result) : null;
 }
 
-public static double /*float*/ systemFontSize() {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSize);
+public static double systemFontSize() {
+	return OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSize);
 }
 
-public static double /*float*/ systemFontSizeForControlSize(long /*int*/ controlSize) {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSizeForControlSize_, controlSize);
+public static double systemFontSizeForControlSize(long controlSize) {
+	return OS.objc_msgSend_fpret(OS.class_NSFont, OS.sel_systemFontSizeForControlSize_, controlSize);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontManager.java
index 39ac39eb58..5c32746452 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontManager.java
@@ -19,7 +19,7 @@ public NSFontManager() {
 	super();
 }
 
-public NSFontManager(long /*int*/ id) {
+public NSFontManager(long id) {
 	super(id);
 }
 
@@ -28,40 +28,40 @@ public NSFontManager(id id) {
 }
 
 public NSArray availableFontFamilies() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_availableFontFamilies);
+	long result = OS.objc_msgSend(this.id, OS.sel_availableFontFamilies);
 	return result != 0 ? new NSArray(result) : null;
 }
 
 public NSArray availableFonts() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_availableFonts);
+	long result = OS.objc_msgSend(this.id, OS.sel_availableFonts);
 	return result != 0 ? new NSArray(result) : null;
 }
 
 public NSArray availableMembersOfFontFamily(NSString fam) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_availableMembersOfFontFamily_, fam != null ? fam.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_availableMembersOfFontFamily_, fam != null ? fam.id : 0);
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public NSFont convertFont(NSFont fontObj, long /*int*/ trait) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_convertFont_toHaveTrait_, fontObj != null ? fontObj.id : 0, trait);
+public NSFont convertFont(NSFont fontObj, long trait) {
+	long result = OS.objc_msgSend(this.id, OS.sel_convertFont_toHaveTrait_, fontObj != null ? fontObj.id : 0, trait);
 	return result != 0 ? new NSFont(result) : null;
 }
 
-public NSFont fontWithFamily(NSString family, long /*int*/ traits, long /*int*/ weight, double /*float*/ size) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_fontWithFamily_traits_weight_size_, family != null ? family.id : 0, traits, weight, size);
+public NSFont fontWithFamily(NSString family, long traits, long weight, double size) {
+	long result = OS.objc_msgSend(this.id, OS.sel_fontWithFamily_traits_weight_size_, family != null ? family.id : 0, traits, weight, size);
 	return result != 0 ? new NSFont(result) : null;
 }
 
 public static NSFontManager sharedFontManager() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSFontManager, OS.sel_sharedFontManager);
+	long result = OS.objc_msgSend(OS.class_NSFontManager, OS.sel_sharedFontManager);
 	return result != 0 ? new NSFontManager(result) : null;
 }
 
-public long /*int*/ traitsOfFont(NSFont fontObj) {
+public long traitsOfFont(NSFont fontObj) {
 	return OS.objc_msgSend(this.id, OS.sel_traitsOfFont_, fontObj != null ? fontObj.id : 0);
 }
 
-public long /*int*/ weightOfFont(NSFont fontObj) {
+public long weightOfFont(NSFont fontObj) {
 	return OS.objc_msgSend(this.id, OS.sel_weightOfFont_, fontObj != null ? fontObj.id : 0);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontPanel.java
index e5d0f36ce1..a5a206ff3f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFontPanel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSFontPanel() {
 	super();
 }
 
-public NSFontPanel(long /*int*/ id) {
+public NSFontPanel(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSFontPanel(id id) {
 }
 
 public NSFont panelConvertFont(NSFont fontObj) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_panelConvertFont_, fontObj != null ? fontObj.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_panelConvertFont_, fontObj != null ? fontObj.id : 0);
 	return result != 0 ? new NSFont(result) : null;
 }
 
@@ -37,15 +37,15 @@ public void setPanelFont(NSFont fontObj, boolean flag) {
 }
 
 public static NSFontPanel sharedFontPanel() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSFontPanel, OS.sel_sharedFontPanel);
+	long result = OS.objc_msgSend(OS.class_NSFontPanel, OS.sel_sharedFontPanel);
 	return result != 0 ? new NSFontPanel(result) : null;
 }
 
-public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSFontPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double minFrameWidthWithTitle(NSString aTitle, long aStyle) {
+	return OS.objc_msgSend_fpret(OS.class_NSFontPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
-public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
+public static long windowNumberAtPoint(NSPoint point, long windowNumber) {
 	return OS.objc_msgSend(OS.class_NSFontPanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormatter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormatter.java
index 5afa6c3178..7d4fb23010 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormatter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSFormatter.java
@@ -19,7 +19,7 @@ public NSFormatter() {
 	super();
 }
 
-public NSFormatter(long /*int*/ id) {
+public NSFormatter(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSFormatter(id id) {
 }
 
 public NSString stringForObjectValue(id obj) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringForObjectValue_, obj != null ? obj.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_stringForObjectValue_, obj != null ? obj.id : 0);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGradient.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGradient.java
index b0c92d994f..767da31338 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGradient.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGradient.java
@@ -19,7 +19,7 @@ public NSGradient() {
 	super();
 }
 
-public NSGradient(long /*int*/ id) {
+public NSGradient(long id) {
 	super(id);
 }
 
@@ -27,25 +27,25 @@ public NSGradient(id id) {
 	super(id);
 }
 
-public void drawFromPoint(NSPoint startingPoint, NSPoint endingPoint, long /*int*/ options) {
+public void drawFromPoint(NSPoint startingPoint, NSPoint endingPoint, long options) {
 	OS.objc_msgSend(this.id, OS.sel_drawFromPoint_toPoint_options_, startingPoint, endingPoint, options);
 }
 
-public void drawInBezierPath(NSBezierPath path, double /*float*/ angle) {
+public void drawInBezierPath(NSBezierPath path, double angle) {
 	OS.objc_msgSend(this.id, OS.sel_drawInBezierPath_angle_, path != null ? path.id : 0, angle);
 }
 
-public void drawInRect(NSRect rect, double /*float*/ angle) {
+public void drawInRect(NSRect rect, double angle) {
 	OS.objc_msgSend(this.id, OS.sel_drawInRect_angle_, rect, angle);
 }
 
 public NSGradient initWithColors(NSArray colorArray) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithColors_, colorArray != null ? colorArray.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithColors_, colorArray != null ? colorArray.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSGradient(result) : null);
 }
 
 public NSGradient initWithStartingColor(NSColor startingColor, NSColor endingColor) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithStartingColor_endingColor_, startingColor != null ? startingColor.id : 0, endingColor != null ? endingColor.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithStartingColor_endingColor_, startingColor != null ? startingColor.id : 0, endingColor != null ? endingColor.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSGradient(result) : null);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java
index 128fe9a38b..65d4313747 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java
@@ -19,7 +19,7 @@ public NSGraphicsContext() {
 	super();
 }
 
-public NSGraphicsContext(long /*int*/ id) {
+public NSGraphicsContext(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSGraphicsContext(id id) {
 }
 
 public static NSGraphicsContext currentContext() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_currentContext);
+	long result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_currentContext);
 	return result != 0 ? new NSGraphicsContext(result) : null;
 }
 
@@ -37,25 +37,25 @@ public void flushGraphics() {
 }
 
 public static NSGraphicsContext graphicsContextWithBitmapImageRep(NSBitmapImageRep bitmapRep) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithBitmapImageRep_, bitmapRep != null ? bitmapRep.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithBitmapImageRep_, bitmapRep != null ? bitmapRep.id : 0);
 	return result != 0 ? new NSGraphicsContext(result) : null;
 }
 
-public static NSGraphicsContext graphicsContextWithGraphicsPort(long /*int*/ graphicsPort, boolean initialFlippedState) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithGraphicsPort_flipped_, graphicsPort, initialFlippedState);
+public static NSGraphicsContext graphicsContextWithGraphicsPort(long graphicsPort, boolean initialFlippedState) {
+	long result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithGraphicsPort_flipped_, graphicsPort, initialFlippedState);
 	return result != 0 ? new NSGraphicsContext(result) : null;
 }
 
 public static NSGraphicsContext graphicsContextWithWindow(NSWindow window) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithWindow_, window != null ? window.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_graphicsContextWithWindow_, window != null ? window.id : 0);
 	return result != 0 ? new NSGraphicsContext(result) : null;
 }
 
-public long /*int*/ graphicsPort() {
+public long graphicsPort() {
 	return OS.objc_msgSend(this.id, OS.sel_graphicsPort);
 }
 
-public long /*int*/ imageInterpolation() {
+public long imageInterpolation() {
 	return OS.objc_msgSend(this.id, OS.sel_imageInterpolation);
 }
 
@@ -83,7 +83,7 @@ public void saveGraphicsState() {
 	OS.objc_msgSend(this.id, OS.sel_saveGraphicsState);
 }
 
-public void setCompositingOperation(long /*int*/ compositingOperation) {
+public void setCompositingOperation(long compositingOperation) {
 	OS.objc_msgSend(this.id, OS.sel_setCompositingOperation_, compositingOperation);
 }
 
@@ -91,7 +91,7 @@ public static void setCurrentContext(NSGraphicsContext context) {
 	OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_setCurrentContext_, context != null ? context.id : 0);
 }
 
-public void setImageInterpolation(long /*int*/ imageInterpolation) {
+public void setImageInterpolation(long imageInterpolation) {
 	OS.objc_msgSend(this.id, OS.sel_setImageInterpolation_, imageInterpolation);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookie.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookie.java
index 525f40c5c5..0324cc4062 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookie.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookie.java
@@ -19,7 +19,7 @@ public NSHTTPCookie() {
 	super();
 }
 
-public NSHTTPCookie(long /*int*/ id) {
+public NSHTTPCookie(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSHTTPCookie(id id) {
 }
 
 public static NSArray cookiesWithResponseHeaderFields(NSDictionary headerFields, NSURL URL) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSHTTPCookie, OS.sel_cookiesWithResponseHeaderFields_forURL_, headerFields != null ? headerFields.id : 0, URL != null ? URL.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSHTTPCookie, OS.sel_cookiesWithResponseHeaderFields_forURL_, headerFields != null ? headerFields.id : 0, URL != null ? URL.id : 0);
 	return result != 0 ? new NSArray(result) : null;
 }
 
@@ -37,12 +37,12 @@ public boolean isSessionOnly() {
 }
 
 public NSString name() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_name);
+	long result = OS.objc_msgSend(this.id, OS.sel_name);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSString value() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_value);
+	long result = OS.objc_msgSend(this.id, OS.sel_value);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookieStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookieStorage.java
index dfe15f9443..faa0ca3ead 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookieStorage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSHTTPCookieStorage.java
@@ -19,7 +19,7 @@ public NSHTTPCookieStorage() {
 	super();
 }
 
-public NSHTTPCookieStorage(long /*int*/ id) {
+public NSHTTPCookieStorage(long id) {
 	super(id);
 }
 
@@ -28,12 +28,12 @@ public NSHTTPCookieStorage(id id) {
 }
 
 public NSArray cookies() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_cookies);
+	long result = OS.objc_msgSend(this.id, OS.sel_cookies);
 	return result != 0 ? new NSArray(result) : null;
 }
 
 public NSArray cookiesForURL(NSURL URL) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_cookiesForURL_, URL != null ? URL.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_cookiesForURL_, URL != null ? URL.id : 0);
 	return result != 0 ? new NSArray(result) : null;
 }
 
@@ -46,7 +46,7 @@ public void setCookie(NSHTTPCookie cookie) {
 }
 
 public static NSHTTPCookieStorage sharedHTTPCookieStorage() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSHTTPCookieStorage, OS.sel_sharedHTTPCookieStorage);
+	long result = OS.objc_msgSend(OS.class_NSHTTPCookieStorage, OS.sel_sharedHTTPCookieStorage);
 	return result != 0 ? new NSHTTPCookieStorage(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java
index a797dcb584..39be67315e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java
@@ -19,7 +19,7 @@ public NSImage() {
 	super();
 }
 
-public NSImage(long /*int*/ id) {
+public NSImage(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSImage(id id) {
 }
 
 public NSData TIFFRepresentation() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation);
+	long result = OS.objc_msgSend(this.id, OS.sel_TIFFRepresentation);
 	return result != 0 ? new NSData(result) : null;
 }
 
@@ -37,45 +37,45 @@ public void addRepresentation(NSImageRep imageRep) {
 }
 
 public NSImageRep bestRepresentationForDevice(NSDictionary deviceDescription) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_bestRepresentationForDevice_, deviceDescription != null ? deviceDescription.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_bestRepresentationForDevice_, deviceDescription != null ? deviceDescription.id : 0);
 	return result != 0 ? new NSImageRep(result) : null;
 }
 
-public void drawAtPoint(NSPoint point, NSRect fromRect, long /*int*/ op, double /*float*/ delta) {
+public void drawAtPoint(NSPoint point, NSRect fromRect, long op, double delta) {
 	OS.objc_msgSend(this.id, OS.sel_drawAtPoint_fromRect_operation_fraction_, point, fromRect, op, delta);
 }
 
-public void drawInRect(NSRect rect, NSRect fromRect, long /*int*/ op, double /*float*/ delta) {
+public void drawInRect(NSRect rect, NSRect fromRect, long op, double delta) {
 	OS.objc_msgSend(this.id, OS.sel_drawInRect_fromRect_operation_fraction_, rect, fromRect, op, delta);
 }
 
 public static NSImage imageNamed(NSString name) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSImage, OS.sel_imageNamed_, name != null ? name.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSImage, OS.sel_imageNamed_, name != null ? name.id : 0);
 	return result != 0 ? new NSImage(result) : null;
 }
 
 public NSImage initByReferencingFile(NSString fileName) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initByReferencingFile_, fileName != null ? fileName.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initByReferencingFile_, fileName != null ? fileName.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSImage(result) : null);
 }
 
 public NSImage initWithContentsOfFile(NSString fileName) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_, fileName != null ? fileName.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithContentsOfFile_, fileName != null ? fileName.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSImage(result) : null);
 }
 
 public NSImage initWithData(NSData data) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithData_, data != null ? data.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithData_, data != null ? data.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSImage(result) : null);
 }
 
-public NSImage initWithIconRef(long /*int*/ iconRef) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIconRef_, iconRef);
+public NSImage initWithIconRef(long iconRef) {
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithIconRef_, iconRef);
 	return result == this.id ? this : (result != 0 ? new NSImage(result) : null);
 }
 
 public NSImage initWithSize(NSSize aSize) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithSize_, aSize);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithSize_, aSize);
 	return result == this.id ? this : (result != 0 ? new NSImage(result) : null);
 }
 
@@ -88,11 +88,11 @@ public void removeRepresentation(NSImageRep imageRep) {
 }
 
 public NSArray representations() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_representations);
+	long result = OS.objc_msgSend(this.id, OS.sel_representations);
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public void setCacheMode(long /*int*/ cacheMode) {
+public void setCacheMode(long cacheMode) {
 	OS.objc_msgSend(this.id, OS.sel_setCacheMode_, cacheMode);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java
index bcaa0a5ec0..9304a2bec5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java
@@ -19,7 +19,7 @@ public NSImageRep() {
 	super();
 }
 
-public NSImageRep(long /*int*/ id) {
+public NSImageRep(long id) {
 	super(id);
 }
 
@@ -27,12 +27,12 @@ public NSImageRep(id id) {
 	super(id);
 }
 
-public long /*int*/ bitsPerSample() {
+public long bitsPerSample() {
 	return OS.objc_msgSend(this.id, OS.sel_bitsPerSample);
 }
 
 public NSString colorSpaceName() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_colorSpaceName);
+	long result = OS.objc_msgSend(this.id, OS.sel_colorSpaceName);
 	return result != 0 ? new NSString(result) : null;
 }
 
@@ -45,15 +45,15 @@ public boolean hasAlpha() {
 }
 
 public static NSImageRep imageRepWithContentsOfFile(NSString filename) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepWithContentsOfFile_, filename != null ? filename.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepWithContentsOfFile_, filename != null ? filename.id : 0);
 	return result != 0 ? new NSImageRep(result) : null;
 }
 
-public long /*int*/ pixelsHigh() {
+public long pixelsHigh() {
 	return OS.objc_msgSend(this.id, OS.sel_pixelsHigh);
 }
 
-public long /*int*/ pixelsWide() {
+public long pixelsWide() {
 	return OS.objc_msgSend(this.id, OS.sel_pixelsWide);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java
index 54c5e07126..c6fb1a2589 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java
@@ -19,7 +19,7 @@ public NSImageView() {
 	super();
 }
 
-public NSImageView(long /*int*/ id) {
+public NSImageView(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSImageView(id id) {
 }
 
 public NSImage image() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_image);
+	long result = OS.objc_msgSend(this.id, OS.sel_image);
 	return result != 0 ? new NSImage(result) : null;
 }
 
@@ -36,19 +36,19 @@ public void setImage(NSImage image) {
 	OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0);
 }
 
-public void setImageAlignment(long /*int*/ imageAlignment) {
+public void setImageAlignment(long imageAlignment) {
 	OS.objc_msgSend(this.id, OS.sel_setImageAlignment_, imageAlignment);
 }
 
-public void setImageScaling(long /*int*/ imageScaling) {
+public void setImageScaling(long imageScaling) {
 	OS.objc_msgSend(this.id, OS.sel_setImageScaling_, imageScaling);
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSImageView, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSImageView, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java
index 5c503e4140..602b8cd382 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java
@@ -19,7 +19,7 @@ public NSIndexSet() {
 	super();
 }
 
-public NSIndexSet(long /*int*/ id) {
+public NSIndexSet(long id) {
 	super(id);
 }
 
@@ -27,39 +27,39 @@ public NSIndexSet(id id) {
 	super(id);
 }
 
-public boolean containsIndex(long /*int*/ value) {
+public boolean containsIndex(long value) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_containsIndex_, value);
 }
 
-public long /*int*/ count() {
+public long count() {
 	return OS.objc_msgSend(this.id, OS.sel_count);
 }
 
-public long /*int*/ firstIndex() {
+public long firstIndex() {
 	return OS.objc_msgSend(this.id, OS.sel_firstIndex);
 }
 
-public long /*int*/ getIndexes(long[] /*int[]*/ indexBuffer, long /*int*/ bufferSize, long /*int*/ range) {
+public long getIndexes(long[] indexBuffer, long bufferSize, long range) {
 	return OS.objc_msgSend(this.id, OS.sel_getIndexes_maxCount_inIndexRange_, indexBuffer, bufferSize, range);
 }
 
-public static NSIndexSet indexSetWithIndex(long /*int*/ value) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSIndexSet, OS.sel_indexSetWithIndex_, value);
+public static NSIndexSet indexSetWithIndex(long value) {
+	long result = OS.objc_msgSend(OS.class_NSIndexSet, OS.sel_indexSetWithIndex_, value);
 	return result != 0 ? new NSIndexSet(result) : null;
 }
 
-public NSIndexSet initWithIndex(long /*int*/ value) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIndex_, value);
+public NSIndexSet initWithIndex(long value) {
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithIndex_, value);
 	return result == this.id ? this : (result != 0 ? new NSIndexSet(result) : null);
 }
 
 public NSIndexSet initWithIndexSet(NSIndexSet indexSet) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIndexSet_, indexSet != null ? indexSet.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithIndexSet_, indexSet != null ? indexSet.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSIndexSet(result) : null);
 }
 
 public NSIndexSet initWithIndexesInRange(NSRange range) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIndexesInRange_, range);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithIndexesInRange_, range);
 	return result == this.id ? this : (result != 0 ? new NSIndexSet(result) : null);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputManager.java
index 15439246d8..32a0c8e1e3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSInputManager.java
@@ -19,7 +19,7 @@ public NSInputManager() {
 	super();
 }
 
-public NSInputManager(long /*int*/ id) {
+public NSInputManager(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSInputManager(id id) {
 }
 
 public static NSInputManager currentInputManager() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSInputManager, OS.sel_currentInputManager);
+	long result = OS.objc_msgSend(OS.class_NSInputManager, OS.sel_currentInputManager);
 	return result != 0 ? new NSInputManager(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedArchiver.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedArchiver.java
index 849061e10f..20215b129f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedArchiver.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedArchiver.java
@@ -19,7 +19,7 @@ public NSKeyedArchiver() {
 	super();
 }
 
-public NSKeyedArchiver(long /*int*/ id) {
+public NSKeyedArchiver(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSKeyedArchiver(id id) {
 }
 
 public static NSData archivedDataWithRootObject(id rootObject) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSKeyedArchiver, OS.sel_archivedDataWithRootObject_, rootObject != null ? rootObject.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSKeyedArchiver, OS.sel_archivedDataWithRootObject_, rootObject != null ? rootObject.id : 0);
 	return result != 0 ? new NSData(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedUnarchiver.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedUnarchiver.java
index bc9b424044..f937b29c4a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedUnarchiver.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSKeyedUnarchiver.java
@@ -19,7 +19,7 @@ public NSKeyedUnarchiver() {
 	super();
 }
 
-public NSKeyedUnarchiver(long /*int*/ id) {
+public NSKeyedUnarchiver(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSKeyedUnarchiver(id id) {
 }
 
 public static id unarchiveObjectWithData(NSData data) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSKeyedUnarchiver, OS.sel_unarchiveObjectWithData_, data != null ? data.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSKeyedUnarchiver, OS.sel_unarchiveObjectWithData_, data != null ? data.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java
index ef43723ac8..9bb5df3c9d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSLayoutManager() {
 	super();
 }
 
-public NSLayoutManager(long /*int*/ id) {
+public NSLayoutManager(long id) {
 	super(id);
 }
 
@@ -41,16 +41,16 @@ public NSRect boundingRectForGlyphRange(NSRange glyphRange, NSTextContainer cont
 	return result;
 }
 
-public long /*int*/ characterIndexForGlyphAtIndex(long /*int*/ glyphIndex) {
+public long characterIndexForGlyphAtIndex(long glyphIndex) {
 	return OS.objc_msgSend(this.id, OS.sel_characterIndexForGlyphAtIndex_, glyphIndex);
 }
 
-public double /*float*/ defaultBaselineOffsetForFont(NSFont theFont) {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_defaultBaselineOffsetForFont_, theFont != null ? theFont.id : 0);
+public double defaultBaselineOffsetForFont(NSFont theFont) {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_defaultBaselineOffsetForFont_, theFont != null ? theFont.id : 0);
 }
 
-public double /*float*/ defaultLineHeightForFont(NSFont theFont) {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_defaultLineHeightForFont_, theFont != null ? theFont.id : 0);
+public double defaultLineHeightForFont(NSFont theFont) {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_defaultLineHeightForFont_, theFont != null ? theFont.id : 0);
 }
 
 public void drawBackgroundForGlyphRange(NSRange glyphsToShow, NSPoint origin) {
@@ -61,23 +61,23 @@ public void drawGlyphsForGlyphRange(NSRange glyphsToShow, NSPoint origin) {
 	OS.objc_msgSend(this.id, OS.sel_drawGlyphsForGlyphRange_atPoint_, glyphsToShow, origin);
 }
 
-public long /*int*/ getGlyphs(long /*int*/ glyphArray, NSRange glyphRange) {
+public long getGlyphs(long glyphArray, NSRange glyphRange) {
 	return OS.objc_msgSend(this.id, OS.sel_getGlyphs_range_, glyphArray, glyphRange);
 }
 
-public long /*int*/ getGlyphsInRange(NSRange glyphRange, long /*int*/ glyphBuffer, long /*int*/ charIndexBuffer, long /*int*/ inscribeBuffer, long /*int*/ elasticBuffer, byte[] bidiLevelBuffer) {
+public long getGlyphsInRange(NSRange glyphRange, long glyphBuffer, long charIndexBuffer, long inscribeBuffer, long elasticBuffer, byte[] bidiLevelBuffer) {
 	return OS.objc_msgSend(this.id, OS.sel_getGlyphsInRange_glyphs_characterIndexes_glyphInscriptions_elasticBits_bidiLevels_, glyphRange, glyphBuffer, charIndexBuffer, inscribeBuffer, elasticBuffer, bidiLevelBuffer);
 }
 
-public long /*int*/ glyphIndexForCharacterAtIndex(long /*int*/ charIndex) {
+public long glyphIndexForCharacterAtIndex(long charIndex) {
 	return OS.objc_msgSend(this.id, OS.sel_glyphIndexForCharacterAtIndex_, charIndex);
 }
 
-public long /*int*/ glyphIndexForPoint(NSPoint point, NSTextContainer container, double[] /*float[]*/ partialFraction) {
+public long glyphIndexForPoint(NSPoint point, NSTextContainer container, double[] partialFraction) {
 	return OS.objc_msgSend(this.id, OS.sel_glyphIndexForPoint_inTextContainer_fractionOfDistanceThroughGlyph_, point, container != null ? container.id : 0, partialFraction);
 }
 
-public NSRange glyphRangeForCharacterRange(NSRange charRange, long /*int*/ actualCharRange) {
+public NSRange glyphRangeForCharacterRange(NSRange charRange, long actualCharRange) {
 	NSRange result = new NSRange();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_glyphRangeForCharacterRange_actualCharacterRange_, charRange, actualCharRange);
 	return result;
@@ -89,33 +89,33 @@ public NSRange glyphRangeForTextContainer(NSTextContainer container) {
 	return result;
 }
 
-public NSRect lineFragmentUsedRectForGlyphAtIndex(long /*int*/ glyphIndex, long /*int*/ effectiveGlyphRange) {
+public NSRect lineFragmentUsedRectForGlyphAtIndex(long glyphIndex, long effectiveGlyphRange) {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_, glyphIndex, effectiveGlyphRange);
 	return result;
 }
 
-public NSRect lineFragmentUsedRectForGlyphAtIndex(long /*int*/ glyphIndex, long /*int*/ effectiveGlyphRange, boolean flag) {
+public NSRect lineFragmentUsedRectForGlyphAtIndex(long glyphIndex, long effectiveGlyphRange, boolean flag) {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_, glyphIndex, effectiveGlyphRange, flag);
 	return result;
 }
 
-public NSPoint locationForGlyphAtIndex(long /*int*/ glyphIndex) {
+public NSPoint locationForGlyphAtIndex(long glyphIndex) {
 	NSPoint result = new NSPoint();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_locationForGlyphAtIndex_, glyphIndex);
 	return result;
 }
 
-public long /*int*/ numberOfGlyphs() {
+public long numberOfGlyphs() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfGlyphs);
 }
 
-public long /*int*/ rectArrayForCharacterRange(NSRange charRange, NSRange selCharRange, NSTextContainer container, long[] /*int[]*/ rectCount) {
+public long rectArrayForCharacterRange(NSRange charRange, NSRange selCharRange, NSTextContainer container, long[] rectCount) {
 	return OS.objc_msgSend(this.id, OS.sel_rectArrayForCharacterRange_withinSelectedCharacterRange_inTextContainer_rectCount_, charRange, selCharRange, container != null ? container.id : 0, rectCount);
 }
 
-public long /*int*/ rectArrayForGlyphRange(NSRange glyphRange, NSRange selGlyphRange, NSTextContainer container, long[] /*int[]*/ rectCount) {
+public long rectArrayForGlyphRange(NSRange glyphRange, NSRange selGlyphRange, NSTextContainer container, long[] rectCount) {
 	return OS.objc_msgSend(this.id, OS.sel_rectArrayForGlyphRange_withinSelectedGlyphRange_inTextContainer_rectCount_, glyphRange, selGlyphRange, container != null ? container.id : 0, rectCount);
 }
 
@@ -140,7 +140,7 @@ public void setUsesScreenFonts(boolean usesScreenFonts) {
 }
 
 public NSTypesetter typesetter() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_typesetter);
+	long result = OS.objc_msgSend(this.id, OS.sel_typesetter);
 	return result != 0 ? new NSTypesetter(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java
index 0ebb7dddd5..0219947b50 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java
@@ -19,7 +19,7 @@ public NSLocale() {
 	super();
 }
 
-public NSLocale(long /*int*/ id) {
+public NSLocale(long id) {
 	super(id);
 }
 
@@ -28,12 +28,12 @@ public NSLocale(id id) {
 }
 
 public NSString displayNameForKey(id key, id value) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_displayNameForKey_value_, key != null ? key.id : 0, value != null ? value.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_displayNameForKey_value_, key != null ? key.id : 0, value != null ? value.id : 0);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSLocale initWithLocaleIdentifier(NSString string) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithLocaleIdentifier_, string != null ? string.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithLocaleIdentifier_, string != null ? string.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSLocale(result) : null);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java
index f71528dbbd..3b77621b63 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java
@@ -19,7 +19,7 @@ public NSMenu() {
 	super();
 }
 
-public NSMenu(long /*int*/ id) {
+public NSMenu(long id) {
 	super(id);
 }
 
@@ -31,8 +31,8 @@ public void addItem(NSMenuItem newItem) {
 	OS.objc_msgSend(this.id, OS.sel_addItem_, newItem != null ? newItem.id : 0);
 }
 
-public NSMenuItem addItemWithTitle(NSString aString, long /*int*/ aSelector, NSString charCode) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_addItemWithTitle_action_keyEquivalent_, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0);
+public NSMenuItem addItemWithTitle(NSString aString, long aSelector, NSString charCode) {
+	long result = OS.objc_msgSend(this.id, OS.sel_addItemWithTitle_action_keyEquivalent_, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0);
 	return result != 0 ? new NSMenuItem(result) : null;
 }
 
@@ -40,35 +40,35 @@ public void cancelTracking() {
 	OS.objc_msgSend(this.id, OS.sel_cancelTracking);
 }
 
-public long /*int*/ indexOfItemWithTarget(id target, long /*int*/ actionSelector) {
+public long indexOfItemWithTarget(id target, long actionSelector) {
 	return OS.objc_msgSend(this.id, OS.sel_indexOfItemWithTarget_andAction_, target != null ? target.id : 0, actionSelector);
 }
 
 public NSMenu initWithTitle(NSString aTitle) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_, aTitle != null ? aTitle.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_, aTitle != null ? aTitle.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSMenu(result) : null);
 }
 
-public void insertItem(NSMenuItem newItem, long /*int*/ index) {
+public void insertItem(NSMenuItem newItem, long index) {
 	OS.objc_msgSend(this.id, OS.sel_insertItem_atIndex_, newItem != null ? newItem.id : 0, index);
 }
 
 public NSArray itemArray() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemArray);
+	long result = OS.objc_msgSend(this.id, OS.sel_itemArray);
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public NSMenuItem itemAtIndex(long /*int*/ index) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index);
+public NSMenuItem itemAtIndex(long index) {
+	long result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index);
 	return result != 0 ? new NSMenuItem(result) : null;
 }
 
-public NSMenuItem itemWithTag(long /*int*/ tag) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemWithTag_, tag);
+public NSMenuItem itemWithTag(long tag) {
+	long result = OS.objc_msgSend(this.id, OS.sel_itemWithTag_, tag);
 	return result != 0 ? new NSMenuItem(result) : null;
 }
 
-public long /*int*/ numberOfItems() {
+public long numberOfItems() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfItems);
 }
 
@@ -84,7 +84,7 @@ public void removeItem(NSMenuItem item) {
 	OS.objc_msgSend(this.id, OS.sel_removeItem_, item != null ? item.id : 0);
 }
 
-public void removeItemAtIndex(long /*int*/ index) {
+public void removeItemAtIndex(long index) {
 	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
 }
 
@@ -105,7 +105,7 @@ public void setTitle(NSString title) {
 }
 
 public NSString title() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_title);
+	long result = OS.objc_msgSend(this.id, OS.sel_title);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java
index f4110b6143..239f26abf8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java
@@ -19,7 +19,7 @@ public NSMenuItem() {
 	super();
 }
 
-public NSMenuItem(long /*int*/ id) {
+public NSMenuItem(long id) {
 	super(id);
 }
 
@@ -27,22 +27,22 @@ public NSMenuItem(id id) {
 	super(id);
 }
 
-public long /*int*/ action() {
+public long action() {
 	return OS.objc_msgSend(this.id, OS.sel_action);
 }
 
 public NSAttributedString attributedTitle() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
+	long result = OS.objc_msgSend(this.id, OS.sel_attributedTitle);
 	return result != 0 ? new NSAttributedString(result) : null;
 }
 
 public NSImage image() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_image);
+	long result = OS.objc_msgSend(this.id, OS.sel_image);
 	return result != 0 ? new NSImage(result) : null;
 }
 
-public NSMenuItem initWithTitle(NSString aString, long /*int*/ aSelector, NSString charCode) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_action_keyEquivalent_, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0);
+public NSMenuItem initWithTitle(NSString aString, long aSelector, NSString charCode) {
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithTitle_action_keyEquivalent_, aString != null ? aString.id : 0, aSelector, charCode != null ? charCode.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSMenuItem(result) : null);
 }
 
@@ -55,20 +55,20 @@ public boolean isSeparatorItem() {
 }
 
 public NSString keyEquivalent() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_keyEquivalent);
+	long result = OS.objc_msgSend(this.id, OS.sel_keyEquivalent);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public long /*int*/ keyEquivalentModifierMask() {
+public long keyEquivalentModifierMask() {
 	return OS.objc_msgSend(this.id, OS.sel_keyEquivalentModifierMask);
 }
 
 public static NSMenuItem separatorItem() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMenuItem, OS.sel_separatorItem);
+	long result = OS.objc_msgSend(OS.class_NSMenuItem, OS.sel_separatorItem);
 	return result != 0 ? new NSMenuItem(result) : null;
 }
 
-public void setAction(long /*int*/ action) {
+public void setAction(long action) {
 	OS.objc_msgSend(this.id, OS.sel_setAction_, action);
 }
 
@@ -92,7 +92,7 @@ public void setKeyEquivalent(NSString keyEquivalent) {
 	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_, keyEquivalent != null ? keyEquivalent.id : 0);
 }
 
-public void setKeyEquivalentModifierMask(long /*int*/ keyEquivalentModifierMask) {
+public void setKeyEquivalentModifierMask(long keyEquivalentModifierMask) {
 	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalentModifierMask_, keyEquivalentModifierMask);
 }
 
@@ -100,7 +100,7 @@ public void setMenu(NSMenu menu) {
 	OS.objc_msgSend(this.id, OS.sel_setMenu_, menu != null ? menu.id : 0);
 }
 
-public void setState(long /*int*/ state) {
+public void setState(long state) {
 	OS.objc_msgSend(this.id, OS.sel_setState_, state);
 }
 
@@ -108,7 +108,7 @@ public void setSubmenu(NSMenu submenu) {
 	OS.objc_msgSend(this.id, OS.sel_setSubmenu_, submenu != null ? submenu.id : 0);
 }
 
-public void setTag(long /*int*/ tag) {
+public void setTag(long tag) {
 	OS.objc_msgSend(this.id, OS.sel_setTag_, tag);
 }
 
@@ -124,26 +124,26 @@ public void setToolTip(NSString toolTip) {
 	OS.objc_msgSend(this.id, OS.sel_setToolTip_, toolTip != null ? toolTip.id : 0);
 }
 
-public long /*int*/ state() {
+public long state() {
 	return OS.objc_msgSend(this.id, OS.sel_state);
 }
 
 public NSMenu submenu() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_submenu);
+	long result = OS.objc_msgSend(this.id, OS.sel_submenu);
 	return result != 0 ? new NSMenu(result) : null;
 }
 
-public long /*int*/ tag() {
+public long tag() {
 	return OS.objc_msgSend(this.id, OS.sel_tag);
 }
 
 public id target() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_target);
+	long result = OS.objc_msgSend(this.id, OS.sel_target);
 	return result != 0 ? new id(result) : null;
 }
 
 public NSString title() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_title);
+	long result = OS.objc_msgSend(this.id, OS.sel_title);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java
index 2f3562cabf..43c34d92e6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java
@@ -19,7 +19,7 @@ public NSMutableArray() {
 	super();
 }
 
-public NSMutableArray(long /*int*/ id) {
+public NSMutableArray(long id) {
 	super(id);
 }
 
@@ -35,13 +35,13 @@ public void addObjectsFromArray(NSArray otherArray) {
 	OS.objc_msgSend(this.id, OS.sel_addObjectsFromArray_, otherArray != null ? otherArray.id : 0);
 }
 
-public static NSMutableArray arrayWithCapacity(long /*int*/ numItems) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithCapacity_, numItems);
+public static NSMutableArray arrayWithCapacity(long numItems) {
+	long result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithCapacity_, numItems);
 	return result != 0 ? new NSMutableArray(result) : null;
 }
 
-public NSMutableArray initWithCapacity(long /*int*/ numItems) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_, numItems);
+public NSMutableArray initWithCapacity(long numItems) {
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_, numItems);
 	return result == this.id ? this : (result != 0 ? new NSMutableArray(result) : null);
 }
 
@@ -53,7 +53,7 @@ public void removeObject(id anObject) {
 	OS.objc_msgSend(this.id, OS.sel_removeObject_, anObject != null ? anObject.id : 0);
 }
 
-public void removeObjectAtIndex(long /*int*/ index) {
+public void removeObjectAtIndex(long index) {
 	OS.objc_msgSend(this.id, OS.sel_removeObjectAtIndex_, index);
 }
 
@@ -62,12 +62,12 @@ public void removeObjectIdenticalTo(id anObject) {
 }
 
 public static NSArray array() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_array);
+	long result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_array);
 	return result != 0 ? new NSArray(result) : null;
 }
 
 public static NSArray arrayWithObject(id anObject) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0);
 	return result != 0 ? new NSMutableArray(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java
index d7f4c33b0a..84f4750a1e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableAttributedString.java
@@ -19,7 +19,7 @@ public NSMutableAttributedString() {
 	super();
 }
 
-public NSMutableAttributedString(long /*int*/ id) {
+public NSMutableAttributedString(long id) {
 	super(id);
 }
 
@@ -27,7 +27,7 @@ public NSMutableAttributedString(id id) {
 	super(id);
 }
 
-public void setBaseWritingDirection(long /*int*/ writingDirection, NSRange range) {
+public void setBaseWritingDirection(long writingDirection, NSRange range) {
 	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_range_, writingDirection, range);
 }
 
@@ -48,7 +48,7 @@ public void endEditing() {
 }
 
 public NSMutableString mutableString() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_mutableString);
+	long result = OS.objc_msgSend(this.id, OS.sel_mutableString);
 	return result != 0 ? new NSMutableString(result) : null;
 }
 
@@ -65,7 +65,7 @@ public void setAttributedString(NSAttributedString attrString) {
 }
 
 public static NSAttributedString attributedStringWithAttachment(NSTextAttachment attachment) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableAttributedString, OS.sel_attributedStringWithAttachment_, attachment != null ? attachment.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSMutableAttributedString, OS.sel_attributedStringWithAttachment_, attachment != null ? attachment.id : 0);
 	return result != 0 ? new NSAttributedString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java
index 2948e15fcd..b9a5a531a3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java
@@ -19,7 +19,7 @@ public NSMutableDictionary() {
 	super();
 }
 
-public NSMutableDictionary(long /*int*/ id) {
+public NSMutableDictionary(long id) {
 	super(id);
 }
 
@@ -27,13 +27,13 @@ public NSMutableDictionary(id id) {
 	super(id);
 }
 
-public static NSMutableDictionary dictionaryWithCapacity(long /*int*/ numItems) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithCapacity_, numItems);
+public static NSMutableDictionary dictionaryWithCapacity(long numItems) {
+	long result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithCapacity_, numItems);
 	return result != 0 ? new NSMutableDictionary(result) : null;
 }
 
-public NSMutableDictionary initWithCapacity(long /*int*/ numItems) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_, numItems);
+public NSMutableDictionary initWithCapacity(long numItems) {
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithCapacity_, numItems);
 	return result == this.id ? this : (result != 0 ? new NSMutableDictionary(result) : null);
 }
 
@@ -54,7 +54,7 @@ public void setValue(id value, NSString key) {
 }
 
 public static NSDictionary dictionaryWithObject(id object, id key) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0);
 	return result != 0 ? new NSMutableDictionary(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java
index 6c3180310f..fdb828897f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java
@@ -19,7 +19,7 @@ public NSMutableIndexSet() {
 	super();
 }
 
-public NSMutableIndexSet(long /*int*/ id) {
+public NSMutableIndexSet(long id) {
 	super(id);
 }
 
@@ -27,16 +27,16 @@ public NSMutableIndexSet(id id) {
 	super(id);
 }
 
-public void addIndex(long /*int*/ value) {
+public void addIndex(long value) {
 	OS.objc_msgSend(this.id, OS.sel_addIndex_, value);
 }
 
-public void removeIndex(long /*int*/ value) {
+public void removeIndex(long value) {
 	OS.objc_msgSend(this.id, OS.sel_removeIndex_, value);
 }
 
-public static NSMutableIndexSet indexSetWithIndex(long /*int*/ value) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableIndexSet, OS.sel_indexSetWithIndex_, value);
+public static NSMutableIndexSet indexSetWithIndex(long value) {
+	long result = OS.objc_msgSend(OS.class_NSMutableIndexSet, OS.sel_indexSetWithIndex_, value);
 	return result != 0 ? new NSMutableIndexSet(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java
index 3c83ea6a6d..000ce929af 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java
@@ -19,7 +19,7 @@ public NSMutableParagraphStyle() {
 	super();
 }
 
-public NSMutableParagraphStyle(long /*int*/ id) {
+public NSMutableParagraphStyle(long id) {
 	super(id);
 }
 
@@ -31,31 +31,31 @@ public void addTabStop(NSTextTab anObject) {
 	OS.objc_msgSend(this.id, OS.sel_addTabStop_, anObject != null ? anObject.id : 0);
 }
 
-public void setAlignment(long /*int*/ alignment) {
+public void setAlignment(long alignment) {
 	OS.objc_msgSend(this.id, OS.sel_setAlignment_, alignment);
 }
 
-public void setBaseWritingDirection(long /*int*/ baseWritingDirection) {
+public void setBaseWritingDirection(long baseWritingDirection) {
 	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, baseWritingDirection);
 }
 
-public void setDefaultTabInterval(double /*float*/ defaultTabInterval) {
+public void setDefaultTabInterval(double defaultTabInterval) {
 	OS.objc_msgSend(this.id, OS.sel_setDefaultTabInterval_, defaultTabInterval);
 }
 
-public void setFirstLineHeadIndent(double /*float*/ firstLineHeadIndent) {
+public void setFirstLineHeadIndent(double firstLineHeadIndent) {
 	OS.objc_msgSend(this.id, OS.sel_setFirstLineHeadIndent_, firstLineHeadIndent);
 }
 
-public void setHeadIndent(double /*float*/ headIndent) {
+public void setHeadIndent(double headIndent) {
 	OS.objc_msgSend(this.id, OS.sel_setHeadIndent_, headIndent);
 }
 
-public void setLineBreakMode(long /*int*/ lineBreakMode) {
+public void setLineBreakMode(long lineBreakMode) {
 	OS.objc_msgSend(this.id, OS.sel_setLineBreakMode_, lineBreakMode);
 }
 
-public void setLineSpacing(double /*float*/ lineSpacing) {
+public void setLineSpacing(double lineSpacing) {
 	OS.objc_msgSend(this.id, OS.sel_setLineSpacing_, lineSpacing);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java
index 374ff0482f..08e59aad57 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java
@@ -19,7 +19,7 @@ public NSMutableSet() {
 	super();
 }
 
-public NSMutableSet(long /*int*/ id) {
+public NSMutableSet(long id) {
 	super(id);
 }
 
@@ -32,7 +32,7 @@ public void addObjectsFromArray(NSArray array) {
 }
 
 public static NSSet set() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableSet, OS.sel_set);
+	long result = OS.objc_msgSend(OS.class_NSMutableSet, OS.sel_set);
 	return result != 0 ? new NSMutableSet(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java
index 87ec1c3228..73b5f10bc1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java
@@ -19,7 +19,7 @@ public NSMutableString() {
 	super();
 }
 
-public NSMutableString(long /*int*/ id) {
+public NSMutableString(long id) {
 	super(id);
 }
 
@@ -40,17 +40,17 @@ public void setString(NSString aString) {
 }
 
 public static NSString string() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_string);
+	long result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_string);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public static NSString stringWithCharacters(char[] characters, long /*int*/ length) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithCharacters_length_, characters, length);
+public static NSString stringWithCharacters(char[] characters, long length) {
+	long result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithCharacters_length_, characters, length);
 	return result != 0 ? new NSMutableString(result) : null;
 }
 
-public static NSString stringWithUTF8String(long /*int*/ nullTerminatedCString) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithUTF8String_, nullTerminatedCString);
+public static NSString stringWithUTF8String(long nullTerminatedCString) {
+	long result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithUTF8String_, nullTerminatedCString);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java
index b9d9cc981f..14def2a1f3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java
@@ -19,7 +19,7 @@ public NSMutableURLRequest() {
 	super();
 }
 
-public NSMutableURLRequest(long /*int*/ id) {
+public NSMutableURLRequest(long id) {
 	super(id);
 }
 
@@ -27,7 +27,7 @@ public NSMutableURLRequest(id id) {
 	super(id);
 }
 
-public void setCachePolicy(long /*int*/ cachePolicy) {
+public void setCachePolicy(long cachePolicy) {
 	OS.objc_msgSend(this.id, OS.sel_setCachePolicy_, cachePolicy);
 }
 
@@ -48,7 +48,7 @@ public void setValue(NSString value, NSString field) {
 }
 
 public static NSURLRequest requestWithURL(NSURL URL) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSMutableURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0);
 	return result != 0 ? new NSMutableURLRequest(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotification.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotification.java
index 15d0e350cf..90c679135b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotification.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotification.java
@@ -19,7 +19,7 @@ public NSNotification() {
 	super();
 }
 
-public NSNotification(long /*int*/ id) {
+public NSNotification(long id) {
 	super(id);
 }
 
@@ -28,12 +28,12 @@ public NSNotification(id id) {
 }
 
 public id object() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_object);
+	long result = OS.objc_msgSend(this.id, OS.sel_object);
 	return result != 0 ? new id(result) : null;
 }
 
 public NSDictionary userInfo() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo);
+	long result = OS.objc_msgSend(this.id, OS.sel_userInfo);
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java
index 5f62f797b9..b4dbbd13e0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNotificationCenter.java
@@ -19,7 +19,7 @@ public NSNotificationCenter() {
 	super();
 }
 
-public NSNotificationCenter(long /*int*/ id) {
+public NSNotificationCenter(long id) {
 	super(id);
 }
 
@@ -27,12 +27,12 @@ public NSNotificationCenter(id id) {
 	super(id);
 }
 
-public void addObserver(id observer, long /*int*/ aSelector, NSString aName, id anObject) {
+public void addObserver(id observer, long aSelector, NSString aName, id anObject) {
 	OS.objc_msgSend(this.id, OS.sel_addObserver_selector_name_object_, observer != null ? observer.id : 0, aSelector, aName != null ? aName.id : 0, anObject != null ? anObject.id : 0);
 }
 
 public static NSNotificationCenter defaultCenter() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSNotificationCenter, OS.sel_defaultCenter);
+	long result = OS.objc_msgSend(OS.class_NSNotificationCenter, OS.sel_defaultCenter);
 	return result != 0 ? new NSNotificationCenter(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumber.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumber.java
index 771baf276d..7ea8b5cde6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumber.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumber.java
@@ -19,7 +19,7 @@ public NSNumber() {
 	super();
 }
 
-public NSNumber(long /*int*/ id) {
+public NSNumber(long id) {
 	super(id);
 }
 
@@ -40,50 +40,50 @@ public float floatValue() {
 }
 
 public int intValue() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_intValue);
+	return (int)OS.objc_msgSend(this.id, OS.sel_intValue);
 }
 
-public long /*int*/ integerValue() {
+public long integerValue() {
 	return OS.objc_msgSend(this.id, OS.sel_integerValue);
 }
 
 public static NSNumber numberWithBool(boolean value) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithBool_, value);
+	long result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithBool_, value);
 	return result != 0 ? new NSNumber(result) : null;
 }
 
 public static NSNumber numberWithDouble(double value) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithDouble_, value);
+	long result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithDouble_, value);
 	return result != 0 ? new NSNumber(result) : null;
 }
 
 public static NSNumber numberWithInt(int value) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithInt_, value);
+	long result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithInt_, value);
 	return result != 0 ? new NSNumber(result) : null;
 }
 
-public static NSNumber numberWithInteger(long /*int*/ value) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithInteger_, value);
+public static NSNumber numberWithInteger(long value) {
+	long result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_numberWithInteger_, value);
 	return result != 0 ? new NSNumber(result) : null;
 }
 
 public static NSValue valueWithPoint(NSPoint point) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithPoint_, point);
+	long result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithPoint_, point);
 	return result != 0 ? new NSValue(result) : null;
 }
 
 public static NSValue valueWithRange(NSRange range) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRange_, range);
+	long result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRange_, range);
 	return result != 0 ? new NSValue(result) : null;
 }
 
 public static NSValue valueWithRect(NSRect rect) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRect_, rect);
+	long result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithRect_, rect);
 	return result != 0 ? new NSValue(result) : null;
 }
 
 public static NSValue valueWithSize(NSSize size) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithSize_, size);
+	long result = OS.objc_msgSend(OS.class_NSNumber, OS.sel_valueWithSize_, size);
 	return result != 0 ? new NSValue(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java
index 05922dedb4..849c2f22bf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java
@@ -19,7 +19,7 @@ public NSNumberFormatter() {
 	super();
 }
 
-public NSNumberFormatter(long /*int*/ id) {
+public NSNumberFormatter(long id) {
 	super(id);
 }
 
@@ -36,25 +36,25 @@ public boolean alwaysShowsDecimalSeparator() {
 }
 
 public NSString decimalSeparator() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_decimalSeparator);
+	long result = OS.objc_msgSend(this.id, OS.sel_decimalSeparator);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSNumber maximum() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_maximum);
+	long result = OS.objc_msgSend(this.id, OS.sel_maximum);
 	return result != 0 ? new NSNumber(result) : null;
 }
 
-public long /*int*/ maximumFractionDigits() {
+public long maximumFractionDigits() {
 	return OS.objc_msgSend(this.id, OS.sel_maximumFractionDigits);
 }
 
-public long /*int*/ maximumIntegerDigits() {
+public long maximumIntegerDigits() {
 	return OS.objc_msgSend(this.id, OS.sel_maximumIntegerDigits);
 }
 
 public NSNumber minimum() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_minimum);
+	long result = OS.objc_msgSend(this.id, OS.sel_minimum);
 	return result != 0 ? new NSNumber(result) : null;
 }
 
@@ -66,11 +66,11 @@ public void setMaximum(NSNumber maximum) {
 	OS.objc_msgSend(this.id, OS.sel_setMaximum_, maximum != null ? maximum.id : 0);
 }
 
-public void setMaximumFractionDigits(long /*int*/ maximumFractionDigits) {
+public void setMaximumFractionDigits(long maximumFractionDigits) {
 	OS.objc_msgSend(this.id, OS.sel_setMaximumFractionDigits_, maximumFractionDigits);
 }
 
-public void setMaximumIntegerDigits(long /*int*/ maximumIntegerDigits) {
+public void setMaximumIntegerDigits(long maximumIntegerDigits) {
 	OS.objc_msgSend(this.id, OS.sel_setMaximumIntegerDigits_, maximumIntegerDigits);
 }
 
@@ -78,15 +78,15 @@ public void setMinimum(NSNumber minimum) {
 	OS.objc_msgSend(this.id, OS.sel_setMinimum_, minimum != null ? minimum.id : 0);
 }
 
-public void setMinimumFractionDigits(long /*int*/ minimumFractionDigits) {
+public void setMinimumFractionDigits(long minimumFractionDigits) {
 	OS.objc_msgSend(this.id, OS.sel_setMinimumFractionDigits_, minimumFractionDigits);
 }
 
-public void setMinimumIntegerDigits(long /*int*/ minimumIntegerDigits) {
+public void setMinimumIntegerDigits(long minimumIntegerDigits) {
 	OS.objc_msgSend(this.id, OS.sel_setMinimumIntegerDigits_, minimumIntegerDigits);
 }
 
-public void setNumberStyle(long /*int*/ numberStyle) {
+public void setNumberStyle(long numberStyle) {
 	OS.objc_msgSend(this.id, OS.sel_setNumberStyle_, numberStyle);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java
index 7753393915..464a62d3dc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java
@@ -19,7 +19,7 @@ public NSObject() {
 	super();
 }
 
-public NSObject(long /*int*/ id) {
+public NSObject(long id) {
 	super(id);
 }
 
@@ -33,7 +33,7 @@ public NSObject alloc() {
 }
 
 public id accessibilityAttributeValue(NSString attribute, id parameter) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_accessibilityAttributeValue_forParameter_, attribute != null ? attribute.id : 0, parameter != null ? parameter.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_accessibilityAttributeValue_forParameter_, attribute != null ? attribute.id : 0, parameter != null ? parameter.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
@@ -41,12 +41,12 @@ public boolean accessibilitySetOverrideValue(id value, NSString attribute) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_accessibilitySetOverrideValue_forAttribute_, value != null ? value.id : 0, attribute != null ? attribute.id : 0);
 }
 
-public void draggedImage(NSImage image, NSPoint screenPoint, long /*int*/ operation) {
+public void draggedImage(NSImage image, NSPoint screenPoint, long operation) {
 	OS.objc_msgSend(this.id, OS.sel_draggedImage_endedAt_operation_, image != null ? image.id : 0, screenPoint, operation);
 }
 
 public NSWindow draggingDestinationWindow() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_draggingDestinationWindow);
+	long result = OS.objc_msgSend(this.id, OS.sel_draggingDestinationWindow);
 	return result != 0 ? new NSWindow(result) : null;
 }
 
@@ -57,11 +57,11 @@ public NSPoint draggingLocation() {
 }
 
 public NSPasteboard draggingPasteboard() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_draggingPasteboard);
+	long result = OS.objc_msgSend(this.id, OS.sel_draggingPasteboard);
 	return result != 0 ? new NSPasteboard(result) : null;
 }
 
-public long /*int*/ draggingSourceOperationMask() {
+public long draggingSourceOperationMask() {
 	return OS.objc_msgSend(this.id, OS.sel_draggingSourceOperationMask);
 }
 
@@ -69,7 +69,7 @@ public boolean outlineView(NSOutlineView outlineView, NSTableColumn tableColumn,
 	return OS.objc_msgSend_bool(this.id, OS.sel_outlineView_shouldEditTableColumn_item_, outlineView != null ? outlineView.id : 0, tableColumn != null ? tableColumn.id : 0, item != null ? item.id : 0);
 }
 
-public boolean outlineView(NSOutlineView outlineView, long /*int*/ columnIndex, long /*int*/ newColumnIndex) {
+public boolean outlineView(NSOutlineView outlineView, long columnIndex, long newColumnIndex) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_outlineView_shouldReorderColumn_toColumn_, outlineView != null ? outlineView.id : 0, columnIndex, newColumnIndex);
 }
 
@@ -85,15 +85,15 @@ public boolean readSelectionFromPasteboard(NSPasteboard pboard) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_readSelectionFromPasteboard_, pboard != null ? pboard.id : 0);
 }
 
-public boolean tableView(NSTableView tableView, long /*int*/ columnIndex, long /*int*/ newColumnIndex) {
+public boolean tableView(NSTableView tableView, long columnIndex, long newColumnIndex) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_tableView_shouldReorderColumn_toColumn_, tableView != null ? tableView.id : 0, columnIndex, newColumnIndex);
 }
 
-public boolean tableView(NSTableView tableView, long /*int*/ row) {
+public boolean tableView(NSTableView tableView, long row) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_tableView_shouldSelectRow_, tableView != null ? tableView.id : 0, row);
 }
 
-public boolean tableView(NSTableView tableView, NSCell cell, NSTableColumn tableColumn, long /*int*/ row) {
+public boolean tableView(NSTableView tableView, NSCell cell, NSTableColumn tableColumn, long row) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_tableView_shouldTrackCell_forTableColumn_row_, tableView != null ? tableView.id : 0, cell != null ? cell.id : 0, tableColumn != null ? tableColumn.id : 0, row);
 }
 
@@ -102,7 +102,7 @@ public boolean writeSelectionToPasteboard(NSPasteboard pboard, NSArray types) {
 }
 
 public NSObject autorelease() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_autorelease);
+	long result = OS.objc_msgSend(this.id, OS.sel_autorelease);
 	return result == this.id ? this : (result != 0 ? new NSObject(result) : null);
 }
 
@@ -111,7 +111,7 @@ public void cancelAuthenticationChallenge(NSURLAuthenticationChallenge challenge
 }
 
 public NSString className() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_className);
+	long result = OS.objc_msgSend(this.id, OS.sel_className);
 	return result != 0 ? new NSString(result) : null;
 }
 
@@ -120,17 +120,17 @@ public boolean conformsToProtocol(Protocol aProtocol) {
 }
 
 public id copy() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_copy);
+	long result = OS.objc_msgSend(this.id, OS.sel_copy);
 	return result != 0 ? new id(result) : null;
 }
 
 public NSString description() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_description);
+	long result = OS.objc_msgSend(this.id, OS.sel_description);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSObject init() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_init);
+	long result = OS.objc_msgSend(this.id, OS.sel_init);
 	return result == this.id ? this : (result != 0 ? new NSObject(result) : null);
 }
 
@@ -142,20 +142,20 @@ public boolean isEqualTo(id object) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_isEqualTo_, object != null ? object.id : 0);
 }
 
-public boolean isKindOfClass(long /*int*/ aClass) {
+public boolean isKindOfClass(long aClass) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_isKindOfClass_, aClass);
 }
 
 public id mutableCopy() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_mutableCopy);
+	long result = OS.objc_msgSend(this.id, OS.sel_mutableCopy);
 	return result != 0 ? new id(result) : null;
 }
 
-public void performSelector(long /*int*/ aSelector, id anArgument, double delay, NSArray modes) {
+public void performSelector(long aSelector, id anArgument, double delay, NSArray modes) {
 	OS.objc_msgSend(this.id, OS.sel_performSelector_withObject_afterDelay_inModes_, aSelector, anArgument != null ? anArgument.id : 0, delay, modes != null ? modes.id : 0);
 }
 
-public void performSelectorOnMainThread(long /*int*/ aSelector, id arg, boolean wait) {
+public void performSelectorOnMainThread(long aSelector, id arg, boolean wait) {
 	OS.objc_msgSend(this.id, OS.sel_performSelectorOnMainThread_withObject_waitUntilDone_, aSelector, arg != null ? arg.id : 0, wait);
 }
 
@@ -163,16 +163,16 @@ public void release() {
 	OS.objc_msgSend(this.id, OS.sel_release);
 }
 
-public boolean respondsToSelector(long /*int*/ aSelector) {
+public boolean respondsToSelector(long aSelector) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_respondsToSelector_, aSelector);
 }
 
 public NSObject retain() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_retain);
+	long result = OS.objc_msgSend(this.id, OS.sel_retain);
 	return result == this.id ? this : (result != 0 ? new NSObject(result) : null);
 }
 
-public long /*int*/ retainCount() {
+public long retainCount() {
 	return OS.objc_msgSend(this.id, OS.sel_retainCount);
 }
 
@@ -180,7 +180,7 @@ public void setValue(id value, NSString key) {
 	OS.objc_msgSend(this.id, OS.sel_setValue_forKey_, value != null ? value.id : 0, key != null ? key.id : 0);
 }
 
-public long /*int*/ superclass() {
+public long superclass() {
 	return OS.objc_msgSend(this.id, OS.sel_superclass);
 }
 
@@ -189,7 +189,7 @@ public void useCredential(NSURLCredential credential, NSURLAuthenticationChallen
 }
 
 public id valueForKey(NSString key) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_valueForKey_, key != null ? key.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_valueForKey_, key != null ? key.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java
index b7f2fec302..0a240a6fa4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java
@@ -19,7 +19,7 @@ public NSOpenGLContext() {
 	super();
 }
 
-public NSOpenGLContext(long /*int*/ id) {
+public NSOpenGLContext(long id) {
 	super(id);
 }
 
@@ -36,7 +36,7 @@ public void clearDrawable() {
 }
 
 public static NSOpenGLContext currentContext() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSOpenGLContext, OS.sel_currentContext);
+	long result = OS.objc_msgSend(OS.class_NSOpenGLContext, OS.sel_currentContext);
 	return result != 0 ? new NSOpenGLContext(result) : null;
 }
 
@@ -45,7 +45,7 @@ public void flushBuffer() {
 }
 
 public NSOpenGLContext initWithFormat(NSOpenGLPixelFormat format, NSOpenGLContext share) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFormat_shareContext_, format != null ? format.id : 0, share != null ? share.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithFormat_shareContext_, format != null ? format.id : 0, share != null ? share.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSOpenGLContext(result) : null);
 }
 
@@ -53,7 +53,7 @@ public void makeCurrentContext() {
 	OS.objc_msgSend(this.id, OS.sel_makeCurrentContext);
 }
 
-public void setValues(int[] vals, long /*int*/ param) {
+public void setValues(int[] vals, long param) {
 	OS.objc_msgSend(this.id, OS.sel_setValues_forParameter_, vals, param);
 }
 
@@ -66,7 +66,7 @@ public void update() {
 }
 
 public NSView view() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_view);
+	long result = OS.objc_msgSend(this.id, OS.sel_view);
 	return result != 0 ? new NSView(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java
index eef6d3ebc1..da32ed233c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java
@@ -19,7 +19,7 @@ public NSOpenGLPixelFormat() {
 	super();
 }
 
-public NSOpenGLPixelFormat(long /*int*/ id) {
+public NSOpenGLPixelFormat(long id) {
 	super(id);
 }
 
@@ -27,12 +27,12 @@ public NSOpenGLPixelFormat(id id) {
 	super(id);
 }
 
-public void getValues(long[] /*int[]*/ vals, int attrib, int screen) {
+public void getValues(long[] vals, int attrib, int screen) {
 	OS.objc_msgSend(this.id, OS.sel_getValues_forAttribute_forVirtualScreen_, vals, attrib, screen);
 }
 
 public NSOpenGLPixelFormat initWithAttributes(int[] attribs) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithAttributes_, attribs);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithAttributes_, attribs);
 	return result == this.id ? this : (result != 0 ? new NSOpenGLPixelFormat(result) : null);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java
index e5de0c5a40..3b245c31c5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSOpenPanel() {
 	super();
 }
 
-public NSOpenPanel(long /*int*/ id) {
+public NSOpenPanel(long id) {
 	super(id);
 }
 
@@ -28,12 +28,12 @@ public NSOpenPanel(id id) {
 }
 
 public NSArray filenames() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_filenames);
+	long result = OS.objc_msgSend(this.id, OS.sel_filenames);
 	return result != 0 ? new NSArray(result) : null;
 }
 
 public static NSOpenPanel openPanel() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_openPanel);
+	long result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_openPanel);
 	return result != 0 ? new NSOpenPanel(result) : null;
 }
 
@@ -50,15 +50,15 @@ public void setCanChooseFiles(boolean canChooseFiles) {
 }
 
 public static NSSavePanel savePanel() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_savePanel);
+	long result = OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_savePanel);
 	return result != 0 ? new NSSavePanel(result) : null;
 }
 
-public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSOpenPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double minFrameWidthWithTitle(NSString aTitle, long aStyle) {
+	return OS.objc_msgSend_fpret(OS.class_NSOpenPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
-public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
+public static long windowNumberAtPoint(NSPoint point, long windowNumber) {
 	return OS.objc_msgSend(OS.class_NSOpenPanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java
index ca2c55bfdb..b323345dec 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSOutlineView() {
 	super();
 }
 
-public NSOutlineView(long /*int*/ id) {
+public NSOutlineView(long id) {
 	super(id);
 }
 
@@ -43,31 +43,31 @@ public void expandItem(id item, boolean expandChildren) {
 	OS.objc_msgSend(this.id, OS.sel_expandItem_expandChildren_, item != null ? item.id : 0, expandChildren);
 }
 
-public NSRect frameOfOutlineCellAtRow(long /*int*/ row) {
+public NSRect frameOfOutlineCellAtRow(long row) {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_frameOfOutlineCellAtRow_, row);
 	return result;
 }
 
-public double /*float*/ indentationPerLevel() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_indentationPerLevel);
+public double indentationPerLevel() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_indentationPerLevel);
 }
 
 public boolean isItemExpanded(id item) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_isItemExpanded_, item != null ? item.id : 0);
 }
 
-public id itemAtRow(long /*int*/ row) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemAtRow_, row);
+public id itemAtRow(long row) {
+	long result = OS.objc_msgSend(this.id, OS.sel_itemAtRow_, row);
 	return result != 0 ? new id(result) : null;
 }
 
-public long /*int*/ levelForItem(id item) {
+public long levelForItem(id item) {
 	return OS.objc_msgSend(this.id, OS.sel_levelForItem_, item != null ? item.id : 0);
 }
 
 public NSTableColumn outlineTableColumn() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_outlineTableColumn);
+	long result = OS.objc_msgSend(this.id, OS.sel_outlineTableColumn);
 	return result != 0 ? new NSTableColumn(result) : null;
 }
 
@@ -75,7 +75,7 @@ public void reloadItem(id item, boolean reloadChildren) {
 	OS.objc_msgSend(this.id, OS.sel_reloadItem_reloadChildren_, item != null ? item.id : 0, reloadChildren);
 }
 
-public long /*int*/ rowForItem(id item) {
+public long rowForItem(id item) {
 	return OS.objc_msgSend(this.id, OS.sel_rowForItem_, item != null ? item.id : 0);
 }
 
@@ -87,7 +87,7 @@ public void setAutosaveExpandedItems(boolean autosaveExpandedItems) {
 	OS.objc_msgSend(this.id, OS.sel_setAutosaveExpandedItems_, autosaveExpandedItems);
 }
 
-public void setDropItem(id item, long /*int*/ index) {
+public void setDropItem(id item, long index) {
 	OS.objc_msgSend(this.id, OS.sel_setDropItem_dropChildIndex_, item != null ? item.id : 0, index);
 }
 
@@ -95,11 +95,11 @@ public void setOutlineTableColumn(NSTableColumn outlineTableColumn) {
 	OS.objc_msgSend(this.id, OS.sel_setOutlineTableColumn_, outlineTableColumn != null ? outlineTableColumn.id : 0);
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSOutlineView, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSOutlineView, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java
index e6ea65a2f9..bc6491e86a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSPanel() {
 	super();
 }
 
-public NSPanel(long /*int*/ id) {
+public NSPanel(long id) {
 	super(id);
 }
 
@@ -43,11 +43,11 @@ public boolean worksWhenModal() {
 	return OS.objc_msgSend_bool(this.id, OS.sel_worksWhenModal);
 }
 
-public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double minFrameWidthWithTitle(NSString aTitle, long aStyle) {
+	return OS.objc_msgSend_fpret(OS.class_NSPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
-public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
+public static long windowNumberAtPoint(NSPoint point, long windowNumber) {
 	return OS.objc_msgSend(OS.class_NSPanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSParagraphStyle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSParagraphStyle.java
index 3241413956..0a78d00d0e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSParagraphStyle.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSParagraphStyle.java
@@ -19,7 +19,7 @@ public NSParagraphStyle() {
 	super();
 }
 
-public NSParagraphStyle(long /*int*/ id) {
+public NSParagraphStyle(long id) {
 	super(id);
 }
 
@@ -27,12 +27,12 @@ public NSParagraphStyle(id id) {
 	super(id);
 }
 
-public long /*int*/ alignment() {
+public long alignment() {
 	return OS.objc_msgSend(this.id, OS.sel_alignment);
 }
 
 public NSArray tabStops() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_tabStops);
+	long result = OS.objc_msgSend(this.id, OS.sel_tabStops);
 	return result != 0 ? new NSArray(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPasteboard.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPasteboard.java
index 2a1089e112..6102a7f482 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPasteboard.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPasteboard.java
@@ -19,7 +19,7 @@ public NSPasteboard() {
 	super();
 }
 
-public NSPasteboard(long /*int*/ id) {
+public NSPasteboard(long id) {
 	super(id);
 }
 
@@ -27,36 +27,36 @@ public NSPasteboard(id id) {
 	super(id);
 }
 
-public long /*int*/ addTypes(NSArray newTypes, id newOwner) {
+public long addTypes(NSArray newTypes, id newOwner) {
 	return OS.objc_msgSend(this.id, OS.sel_addTypes_owner_, newTypes != null ? newTypes.id : 0, newOwner != null ? newOwner.id : 0);
 }
 
 public NSString availableTypeFromArray(NSArray types) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_availableTypeFromArray_, types != null ? types.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_availableTypeFromArray_, types != null ? types.id : 0);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSData dataForType(NSString dataType) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dataForType_, dataType != null ? dataType.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_dataForType_, dataType != null ? dataType.id : 0);
 	return result != 0 ? new NSData(result) : null;
 }
 
-public long /*int*/ declareTypes(NSArray newTypes, id newOwner) {
+public long declareTypes(NSArray newTypes, id newOwner) {
 	return OS.objc_msgSend(this.id, OS.sel_declareTypes_owner_, newTypes != null ? newTypes.id : 0, newOwner != null ? newOwner.id : 0);
 }
 
 public static NSPasteboard generalPasteboard() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_generalPasteboard);
+	long result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_generalPasteboard);
 	return result != 0 ? new NSPasteboard(result) : null;
 }
 
 public static NSPasteboard pasteboardWithName(NSString name) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardWithName_, name != null ? name.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSPasteboard, OS.sel_pasteboardWithName_, name != null ? name.id : 0);
 	return result != 0 ? new NSPasteboard(result) : null;
 }
 
 public id propertyListForType(NSString dataType) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_propertyListForType_, dataType != null ? dataType.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_propertyListForType_, dataType != null ? dataType.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
@@ -73,12 +73,12 @@ public boolean setString(NSString string, NSString dataType) {
 }
 
 public NSString stringForType(NSString dataType) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringForType_, dataType != null ? dataType.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_stringForType_, dataType != null ? dataType.id : 0);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSArray types() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_types);
+	long result = OS.objc_msgSend(this.id, OS.sel_types);
 	return result != 0 ? new NSArray(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java
index 8b4c02e918..3470dcf8a2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java
@@ -15,9 +15,9 @@ package org.eclipse.swt.internal.cocoa;
 
 public class NSPoint {
 	/** @field cast=(CGFloat) */
-	public double /*float*/ x;
+	public double x;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ y;
+	public double y;
 	public static final int sizeof = OS.NSPoint_sizeof();
 
 	@Override
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java
index eaf405a852..55db4987c0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java
@@ -19,7 +19,7 @@ public NSPopUpButton() {
 	super();
 }
 
-public NSPopUpButton(long /*int*/ id) {
+public NSPopUpButton(long id) {
 	super(id);
 }
 
@@ -27,31 +27,31 @@ public NSPopUpButton(id id) {
 	super(id);
 }
 
-public long /*int*/ indexOfSelectedItem() {
+public long indexOfSelectedItem() {
 	return OS.objc_msgSend(this.id, OS.sel_indexOfSelectedItem);
 }
 
 public NSPopUpButton initWithFrame(NSRect buttonFrame, boolean flag) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_pullsDown_, buttonFrame, flag);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_pullsDown_, buttonFrame, flag);
 	return result == this.id ? this : (result != 0 ? new NSPopUpButton(result) : null);
 }
 
-public NSMenuItem itemAtIndex(long /*int*/ index) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index);
+public NSMenuItem itemAtIndex(long index) {
+	long result = OS.objc_msgSend(this.id, OS.sel_itemAtIndex_, index);
 	return result != 0 ? new NSMenuItem(result) : null;
 }
 
-public NSString itemTitleAtIndex(long /*int*/ index) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemTitleAtIndex_, index);
+public NSString itemTitleAtIndex(long index) {
+	long result = OS.objc_msgSend(this.id, OS.sel_itemTitleAtIndex_, index);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSMenu menu() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_menu);
+	long result = OS.objc_msgSend(this.id, OS.sel_menu);
 	return result != 0 ? new NSMenu(result) : null;
 }
 
-public long /*int*/ numberOfItems() {
+public long numberOfItems() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfItems);
 }
 
@@ -59,7 +59,7 @@ public void removeAllItems() {
 	OS.objc_msgSend(this.id, OS.sel_removeAllItems);
 }
 
-public void removeItemAtIndex(long /*int*/ index) {
+public void removeItemAtIndex(long index) {
 	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
 }
 
@@ -67,7 +67,7 @@ public void selectItem(NSMenuItem item) {
 	OS.objc_msgSend(this.id, OS.sel_selectItem_, item != null ? item.id : 0);
 }
 
-public void selectItemAtIndex(long /*int*/ index) {
+public void selectItemAtIndex(long index) {
 	OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_, index);
 }
 
@@ -80,15 +80,15 @@ public void setPullsDown(boolean pullsDown) {
 }
 
 public NSString titleOfSelectedItem() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_titleOfSelectedItem);
+	long result = OS.objc_msgSend(this.id, OS.sel_titleOfSelectedItem);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSPopUpButton, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSPopUpButton, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java
index 9855305a31..03e69d27e4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java
@@ -19,7 +19,7 @@ public NSPrintInfo() {
 	super();
 }
 
-public NSPrintInfo(long /*int*/ id) {
+public NSPrintInfo(long id) {
 	super(id);
 }
 
@@ -27,21 +27,21 @@ public NSPrintInfo(id id) {
 	super(id);
 }
 
-public long /*int*/ PMPrintSession() {
+public long PMPrintSession() {
 	return OS.objc_msgSend(this.id, OS.sel_PMPrintSession);
 }
 
-public long /*int*/ PMPrintSettings() {
+public long PMPrintSettings() {
 	return OS.objc_msgSend(this.id, OS.sel_PMPrintSettings);
 }
 
 public static NSPrinter defaultPrinter() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_defaultPrinter);
+	long result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_defaultPrinter);
 	return result != 0 ? new NSPrinter(result) : null;
 }
 
 public NSMutableDictionary dictionary() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dictionary);
+	long result = OS.objc_msgSend(this.id, OS.sel_dictionary);
 	return result != 0 ? new NSMutableDictionary(result) : null;
 }
 
@@ -52,7 +52,7 @@ public NSRect imageablePageBounds() {
 }
 
 public NSPrintInfo initWithDictionary(NSDictionary attributes) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithDictionary_, attributes != null ? attributes.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithDictionary_, attributes != null ? attributes.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSPrintInfo(result) : null);
 }
 
@@ -61,7 +61,7 @@ public boolean isSelectionOnly() {
 }
 
 public NSString jobDisposition() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_jobDisposition);
+	long result = OS.objc_msgSend(this.id, OS.sel_jobDisposition);
 	return result != 0 ? new NSString(result) : null;
 }
 
@@ -72,12 +72,12 @@ public NSSize paperSize() {
 }
 
 public NSMutableDictionary printSettings() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_printSettings);
+	long result = OS.objc_msgSend(this.id, OS.sel_printSettings);
 	return result != 0 ? new NSMutableDictionary(result) : null;
 }
 
 public NSPrinter printer() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_printer);
+	long result = OS.objc_msgSend(this.id, OS.sel_printer);
 	return result != 0 ? new NSPrinter(result) : null;
 }
 
@@ -98,7 +98,7 @@ public void setUpPrintOperationDefaultValues() {
 }
 
 public static NSPrintInfo sharedPrintInfo() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_sharedPrintInfo);
+	long result = OS.objc_msgSend(OS.class_NSPrintInfo, OS.sel_sharedPrintInfo);
 	return result != 0 ? new NSPrintInfo(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java
index 6dd8e4ca36..12ba5ddb8b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java
@@ -19,7 +19,7 @@ public NSPrintOperation() {
 	super();
 }
 
-public NSPrintOperation(long /*int*/ id) {
+public NSPrintOperation(long id) {
 	super(id);
 }
 
@@ -32,12 +32,12 @@ public void cleanUpOperation() {
 }
 
 public NSGraphicsContext context() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_context);
+	long result = OS.objc_msgSend(this.id, OS.sel_context);
 	return result != 0 ? new NSGraphicsContext(result) : null;
 }
 
 public NSGraphicsContext createContext() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_createContext);
+	long result = OS.objc_msgSend(this.id, OS.sel_createContext);
 	return result != 0 ? new NSGraphicsContext(result) : null;
 }
 
@@ -50,7 +50,7 @@ public void destroyContext() {
 }
 
 public static NSPrintOperation printOperationWithView(NSView view, NSPrintInfo printInfo) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_printOperationWithView_printInfo_, view != null ? view.id : 0, printInfo != null ? printInfo.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSPrintOperation, OS.sel_printOperationWithView_printInfo_, view != null ? view.id : 0, printInfo != null ? printInfo.id : 0);
 	return result != 0 ? new NSPrintOperation(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintPanel.java
index 4a2f01566c..b29199fd1c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintPanel.java
@@ -19,7 +19,7 @@ public NSPrintPanel() {
 	super();
 }
 
-public NSPrintPanel(long /*int*/ id) {
+public NSPrintPanel(long id) {
 	super(id);
 }
 
@@ -27,24 +27,24 @@ public NSPrintPanel(id id) {
 	super(id);
 }
 
-public void beginSheetWithPrintInfo(NSPrintInfo printInfo, NSWindow docWindow, id delegate, long /*int*/ didEndSelector, long /*int*/ contextInfo) {
+public void beginSheetWithPrintInfo(NSPrintInfo printInfo, NSWindow docWindow, id delegate, long didEndSelector, long contextInfo) {
 	OS.objc_msgSend(this.id, OS.sel_beginSheetWithPrintInfo_modalForWindow_delegate_didEndSelector_contextInfo_, printInfo != null ? printInfo.id : 0, docWindow != null ? docWindow.id : 0, delegate != null ? delegate.id : 0, didEndSelector, contextInfo);
 }
 
-public long /*int*/ options() {
+public long options() {
 	return OS.objc_msgSend(this.id, OS.sel_options);
 }
 
 public static NSPrintPanel printPanel() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSPrintPanel, OS.sel_printPanel);
+	long result = OS.objc_msgSend(OS.class_NSPrintPanel, OS.sel_printPanel);
 	return result != 0 ? new NSPrintPanel(result) : null;
 }
 
-public long /*int*/ runModalWithPrintInfo(NSPrintInfo printInfo) {
+public long runModalWithPrintInfo(NSPrintInfo printInfo) {
 	return OS.objc_msgSend(this.id, OS.sel_runModalWithPrintInfo_, printInfo != null ? printInfo.id : 0);
 }
 
-public void setOptions(long /*int*/ options) {
+public void setOptions(long options) {
 	OS.objc_msgSend(this.id, OS.sel_setOptions_, options);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrinter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrinter.java
index 1b19f41e53..84b1be7b18 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrinter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrinter.java
@@ -19,7 +19,7 @@ public NSPrinter() {
 	super();
 }
 
-public NSPrinter(long /*int*/ id) {
+public NSPrinter(long id) {
 	super(id);
 }
 
@@ -28,17 +28,17 @@ public NSPrinter(id id) {
 }
 
 public NSString name() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_name);
+	long result = OS.objc_msgSend(this.id, OS.sel_name);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public static NSArray printerNames() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerNames);
+	long result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerNames);
 	return result != 0 ? new NSArray(result) : null;
 }
 
 public static NSPrinter printerWithName(NSString name) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerWithName_, name != null ? name.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSPrinter, OS.sel_printerWithName_, name != null ? name.id : 0);
 	return result != 0 ? new NSPrinter(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java
index 6e53b40231..2bfe53ddac 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java
@@ -19,7 +19,7 @@ public NSProgressIndicator() {
 	super();
 }
 
-public NSProgressIndicator(long /*int*/ id) {
+public NSProgressIndicator(long id) {
 	super(id);
 }
 
@@ -27,7 +27,7 @@ public NSProgressIndicator(id id) {
 	super(id);
 }
 
-public long /*int*/ controlSize() {
+public long controlSize() {
 	return OS.objc_msgSend(this.id, OS.sel_controlSize);
 }
 
@@ -43,7 +43,7 @@ public double minValue() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_minValue);
 }
 
-public void setControlSize(long /*int*/ controlSize) {
+public void setControlSize(long controlSize) {
 	OS.objc_msgSend(this.id, OS.sel_setControlSize_, controlSize);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java
index f6acd7013e..511b9d8874 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRange.java
@@ -15,8 +15,8 @@ package org.eclipse.swt.internal.cocoa;
 
 public class NSRange {
 	/** @field cast=(NSUInteger) */
-	public long /*int*/ location;
+	public long location;
 	/** @field cast=(NSUInteger) */
-	public long /*int*/ length;
+	public long length;
 	public static final int sizeof = OS.NSRange_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
index b44d4e51ad..495ff39c44 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
@@ -16,13 +16,13 @@ package org.eclipse.swt.internal.cocoa;
 
 public class NSRect {
 	/** @field accessor=origin.x */
-	public double /*float*/ x;
+	public double x;
 	/** @field accessor=origin.y */
-	public double /*float*/ y;
+	public double y;
 	/** @field accessor=size.width */
-	public double /*float*/ width;
+	public double width;
 	/** @field accessor=size.height */
-	public double /*float*/ height;
+	public double height;
 	public static final int sizeof = OS.NSRect_sizeof();
 
 	@Override
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java
index 5eeb9af4de..abc8c0bba4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSResponder.java
@@ -19,7 +19,7 @@ public NSResponder() {
 	super();
 }
 
-public NSResponder(long /*int*/ id) {
+public NSResponder(long id) {
 	super(id);
 }
 
@@ -47,7 +47,7 @@ public void cursorUpdate(NSEvent event) {
 	OS.objc_msgSend(this.id, OS.sel_cursorUpdate_, event != null ? event.id : 0);
 }
 
-public void doCommandBySelector(long /*int*/ aSelector) {
+public void doCommandBySelector(long aSelector) {
 	OS.objc_msgSend(this.id, OS.sel_doCommandBySelector_, aSelector);
 }
 
@@ -119,7 +119,7 @@ public void moveUp(id sender) {
 	OS.objc_msgSend(this.id, OS.sel_moveUp_, sender != null ? sender.id : 0);
 }
 
-public void noResponderFor(long /*int*/ eventSelector) {
+public void noResponderFor(long eventSelector) {
 	OS.objc_msgSend(this.id, OS.sel_noResponderFor_, eventSelector);
 }
 
@@ -192,12 +192,12 @@ public void touchesMovedWithEvent(NSEvent event) {
 }
 
 public NSUndoManager undoManager() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_undoManager);
+	long result = OS.objc_msgSend(this.id, OS.sel_undoManager);
 	return result != 0 ? new NSUndoManager(result) : null;
 }
 
 public id validRequestorForSendType(NSString sendType, NSString returnType) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_validRequestorForSendType_returnType_, sendType != null ? sendType.id : 0, returnType != null ? returnType.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_validRequestorForSendType_returnType_, sendType != null ? sendType.id : 0, returnType != null ? returnType.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunLoop.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunLoop.java
index d9bb60d2a4..c7eb9e45b5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunLoop.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunLoop.java
@@ -19,7 +19,7 @@ public NSRunLoop() {
 	super();
 }
 
-public NSRunLoop(long /*int*/ id) {
+public NSRunLoop(long id) {
 	super(id);
 }
 
@@ -32,12 +32,12 @@ public void addTimer(NSTimer timer, NSString mode) {
 }
 
 public static NSRunLoop currentRunLoop() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_currentRunLoop);
+	long result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_currentRunLoop);
 	return result != 0 ? new NSRunLoop(result) : null;
 }
 
 public static NSRunLoop mainRunLoop() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_mainRunLoop);
+	long result = OS.objc_msgSend(OS.class_NSRunLoop, OS.sel_mainRunLoop);
 	return result != 0 ? new NSRunLoop(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunningApplication.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunningApplication.java
index 89f8126c1d..a36cddb30e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunningApplication.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRunningApplication.java
@@ -19,7 +19,7 @@ public NSRunningApplication() {
 	super();
 }
 
-public NSRunningApplication(long /*int*/ id) {
+public NSRunningApplication(long id) {
 	super(id);
 }
 
@@ -27,12 +27,12 @@ public NSRunningApplication(id id) {
 	super(id);
 }
 
-public boolean activateWithOptions(long /*int*/ options) {
+public boolean activateWithOptions(long options) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_activateWithOptions_, options);
 }
 
 public static NSRunningApplication currentApplication() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSRunningApplication, OS.sel_currentApplication);
+	long result = OS.objc_msgSend(OS.class_NSRunningApplication, OS.sel_currentApplication);
 	return result != 0 ? new NSRunningApplication(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java
index 9ac925bd2a..f7afd38ea4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSSavePanel() {
 	super();
 }
 
-public NSSavePanel(long /*int*/ id) {
+public NSSavePanel(long id) {
 	super(id);
 }
 
@@ -28,20 +28,20 @@ public NSSavePanel(id id) {
 }
 
 public NSString filename() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_filename);
+	long result = OS.objc_msgSend(this.id, OS.sel_filename);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public long /*int*/ runModal() {
+public long runModal() {
 	return OS.objc_msgSend(this.id, OS.sel_runModal);
 }
 
-public long /*int*/ runModalForDirectory(NSString path, NSString name) {
+public long runModalForDirectory(NSString path, NSString name) {
 	return OS.objc_msgSend(this.id, OS.sel_runModalForDirectory_file_, path != null ? path.id : 0, name != null ? name.id : 0);
 }
 
 public static NSSavePanel savePanel() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSSavePanel, OS.sel_savePanel);
+	long result = OS.objc_msgSend(OS.class_NSSavePanel, OS.sel_savePanel);
 	return result != 0 ? new NSSavePanel(result) : null;
 }
 
@@ -89,11 +89,11 @@ public void validateVisibleColumns() {
 	OS.objc_msgSend(this.id, OS.sel_validateVisibleColumns);
 }
 
-public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSSavePanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double minFrameWidthWithTitle(NSString aTitle, long aStyle) {
+	return OS.objc_msgSend_fpret(OS.class_NSSavePanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
-public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
+public static long windowNumberAtPoint(NSPoint point, long windowNumber) {
 	return OS.objc_msgSend(OS.class_NSSavePanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java
index e2fafff4dd..c6a80c67ca 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScreen.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSScreen() {
 	super();
 }
 
-public NSScreen(long /*int*/ id) {
+public NSScreen(long id) {
 	super(id);
 }
 
@@ -27,16 +27,16 @@ public NSScreen(id id) {
 	super(id);
 }
 
-public double /*float*/ backingScaleFactor() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_backingScaleFactor);
+public double backingScaleFactor() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_backingScaleFactor);
 }
 
 public int depth() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_depth);
+	return (int)OS.objc_msgSend(this.id, OS.sel_depth);
 }
 
 public NSDictionary deviceDescription() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_deviceDescription);
+	long result = OS.objc_msgSend(this.id, OS.sel_deviceDescription);
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
@@ -47,12 +47,12 @@ public NSRect frame() {
 }
 
 public static NSScreen mainScreen() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_mainScreen);
+	long result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_mainScreen);
 	return result != 0 ? new NSScreen(result) : null;
 }
 
 public static NSArray screens() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_screens);
+	long result = OS.objc_msgSend(OS.class_NSScreen, OS.sel_screens);
 	return result != 0 ? new NSArray(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java
index 3e555c3efe..dc1565f8d9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java
@@ -19,7 +19,7 @@ public NSScrollView() {
 	super();
 }
 
-public NSScrollView(long /*int*/ id) {
+public NSScrollView(long id) {
 	super(id);
 }
 
@@ -33,19 +33,19 @@ public NSSize contentSize() {
 	return result;
 }
 
-public static NSSize contentSizeForFrameSize(NSSize fSize, boolean hFlag, boolean vFlag, long /*int*/ aType) {
+public static NSSize contentSizeForFrameSize(NSSize fSize, boolean hFlag, boolean vFlag, long aType) {
 	NSSize result = new NSSize();
 	OS.objc_msgSend_stret(result, OS.class_NSScrollView, OS.sel_contentSizeForFrameSize_hasHorizontalScroller_hasVerticalScroller_borderType_, fSize, hFlag, vFlag, aType);
 	return result;
 }
 
 public NSClipView contentView() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_contentView);
+	long result = OS.objc_msgSend(this.id, OS.sel_contentView);
 	return result != 0 ? new NSClipView(result) : null;
 }
 
 public NSView documentView() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_documentView);
+	long result = OS.objc_msgSend(this.id, OS.sel_documentView);
 	return result != 0 ? new NSView(result) : null;
 }
 
@@ -55,7 +55,7 @@ public NSRect documentVisibleRect() {
 	return result;
 }
 
-public static NSSize frameSizeForContentSize(NSSize cSize, boolean hFlag, boolean vFlag, long /*int*/ aType) {
+public static NSSize frameSizeForContentSize(NSSize cSize, boolean hFlag, boolean vFlag, long aType) {
 	NSSize result = new NSSize();
 	OS.objc_msgSend_stret(result, OS.class_NSScrollView, OS.sel_frameSizeForContentSize_hasHorizontalScroller_hasVerticalScroller_borderType_, cSize, hFlag, vFlag, aType);
 	return result;
@@ -69,7 +69,7 @@ public void setAutohidesScrollers(boolean autohidesScrollers) {
 	OS.objc_msgSend(this.id, OS.sel_setAutohidesScrollers_, autohidesScrollers);
 }
 
-public void setBorderType(long /*int*/ borderType) {
+public void setBorderType(long borderType) {
 	OS.objc_msgSend(this.id, OS.sel_setBorderType_, borderType);
 }
 
@@ -93,7 +93,7 @@ public void setHorizontalScroller(NSScroller horizontalScroller) {
 	OS.objc_msgSend(this.id, OS.sel_setHorizontalScroller_, horizontalScroller != null ? horizontalScroller.id : 0);
 }
 
-public void setVerticalScrollElasticity(long /*int*/ verticalScrollElasticity) {
+public void setVerticalScrollElasticity(long verticalScrollElasticity) {
 	OS.objc_msgSend(this.id, OS.sel_setVerticalScrollElasticity_, verticalScrollElasticity);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScroller.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScroller.java
index 81494a6431..ea72124283 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScroller.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScroller.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSScroller() {
 	super();
 }
 
-public NSScroller(long /*int*/ id) {
+public NSScroller(long id) {
 	super(id);
 }
 
@@ -27,49 +27,49 @@ public NSScroller(id id) {
 	super(id);
 }
 
-public long /*int*/ controlSize() {
+public long controlSize() {
 	return OS.objc_msgSend(this.id, OS.sel_controlSize);
 }
 
-public long /*int*/ hitPart() {
+public long hitPart() {
 	return OS.objc_msgSend(this.id, OS.sel_hitPart);
 }
 
-public double /*float*/ knobProportion() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_knobProportion);
+public double knobProportion() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_knobProportion);
 }
 
-public NSRect rectForPart(long /*int*/ partCode) {
+public NSRect rectForPart(long partCode) {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_rectForPart_, partCode);
 	return result;
 }
 
-public static double /*float*/ scrollerWidth() {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidth);
+public static double scrollerWidth() {
+	return OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidth);
 }
 
-public static double /*float*/ scrollerWidthForControlSize(long /*int*/ controlSize) {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidthForControlSize_, controlSize);
+public static double scrollerWidthForControlSize(long controlSize) {
+	return OS.objc_msgSend_fpret(OS.class_NSScroller, OS.sel_scrollerWidthForControlSize_, controlSize);
 }
 
-public void setControlSize(long /*int*/ controlSize) {
+public void setControlSize(long controlSize) {
 	OS.objc_msgSend(this.id, OS.sel_setControlSize_, controlSize);
 }
 
-public void setKnobProportion(double /*float*/ proportion) {
+public void setKnobProportion(double proportion) {
 	OS.objc_msgSend(this.id, OS.sel_setKnobProportion_, proportion);
 }
 
-public long /*int*/ testPart(NSPoint thePoint) {
+public long testPart(NSPoint thePoint) {
 	return OS.objc_msgSend(this.id, OS.sel_testPart_, thePoint);
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSScroller, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSScroller, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchField.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchField.java
index ca513bda34..cc74637188 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchField.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchField.java
@@ -19,7 +19,7 @@ public NSSearchField() {
 	super();
 }
 
-public NSSearchField(long /*int*/ id) {
+public NSSearchField(long id) {
 	super(id);
 }
 
@@ -28,15 +28,15 @@ public NSSearchField(id id) {
 }
 
 public NSArray recentSearches() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_recentSearches);
+	long result = OS.objc_msgSend(this.id, OS.sel_recentSearches);
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSSearchField, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSSearchField, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java
index 3f91d57469..69e9151e4e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java
@@ -19,7 +19,7 @@ public NSSearchFieldCell() {
 	super();
 }
 
-public NSSearchFieldCell(long /*int*/ id) {
+public NSSearchFieldCell(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSSearchFieldCell(id id) {
 }
 
 public NSButtonCell cancelButtonCell() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_cancelButtonCell);
+	long result = OS.objc_msgSend(this.id, OS.sel_cancelButtonCell);
 	return result != 0 ? new NSButtonCell(result) : null;
 }
 
@@ -39,7 +39,7 @@ public NSRect cancelButtonRectForBounds(NSRect rect) {
 }
 
 public NSButtonCell searchButtonCell() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_searchButtonCell);
+	long result = OS.objc_msgSend(this.id, OS.sel_searchButtonCell);
 	return result != 0 ? new NSButtonCell(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextField.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextField.java
index a9ec3d02c0..271c86cd6b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextField.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSecureTextField.java
@@ -19,7 +19,7 @@ public NSSecureTextField() {
 	super();
 }
 
-public NSSecureTextField(long /*int*/ id) {
+public NSSecureTextField(long id) {
 	super(id);
 }
 
@@ -27,11 +27,11 @@ public NSSecureTextField(id id) {
 	super(id);
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSSecureTextField, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSSecureTextField, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java
index ce5f17632f..38c83a1ad3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java
@@ -19,7 +19,7 @@ public NSSegmentedCell() {
 	super();
 }
 
-public NSSegmentedCell(long /*int*/ id) {
+public NSSegmentedCell(long id) {
 	super(id);
 }
 
@@ -27,51 +27,51 @@ public NSSegmentedCell(id id) {
 	super(id);
 }
 
-public void setEnabled(boolean enabled, long /*int*/ segment) {
+public void setEnabled(boolean enabled, long segment) {
 	OS.objc_msgSend(this.id, OS.sel_setEnabled_forSegment_, enabled, segment);
 }
 
-public void setImage(NSImage image, long /*int*/ segment) {
+public void setImage(NSImage image, long segment) {
 	OS.objc_msgSend(this.id, OS.sel_setImage_forSegment_, image != null ? image.id : 0, segment);
 }
 
-public void setLabel(NSString label, long /*int*/ segment) {
+public void setLabel(NSString label, long segment) {
 	OS.objc_msgSend(this.id, OS.sel_setLabel_forSegment_, label != null ? label.id : 0, segment);
 }
 
-public void setMenu(NSMenu menu, long /*int*/ segment) {
+public void setMenu(NSMenu menu, long segment) {
 	OS.objc_msgSend(this.id, OS.sel_setMenu_forSegment_, menu != null ? menu.id : 0, segment);
 }
 
-public void setSegmentCount(long /*int*/ segmentCount) {
+public void setSegmentCount(long segmentCount) {
 	OS.objc_msgSend(this.id, OS.sel_setSegmentCount_, segmentCount);
 }
 
-public void setSegmentStyle(long /*int*/ segmentStyle) {
+public void setSegmentStyle(long segmentStyle) {
 	OS.objc_msgSend(this.id, OS.sel_setSegmentStyle_, segmentStyle);
 }
 
-public void setSelected(boolean selected, long /*int*/ segment) {
+public void setSelected(boolean selected, long segment) {
 	OS.objc_msgSend(this.id, OS.sel_setSelected_forSegment_, selected, segment);
 }
 
-public void setSelectedSegment(long /*int*/ selectedSegment) {
+public void setSelectedSegment(long selectedSegment) {
 	OS.objc_msgSend(this.id, OS.sel_setSelectedSegment_, selectedSegment);
 }
 
-public void setTag(long /*int*/ tag, long /*int*/ segment) {
+public void setTag(long tag, long segment) {
 	OS.objc_msgSend(this.id, OS.sel_setTag_forSegment_, tag, segment);
 }
 
-public void setToolTip(NSString toolTip, long /*int*/ segment) {
+public void setToolTip(NSString toolTip, long segment) {
 	OS.objc_msgSend(this.id, OS.sel_setToolTip_forSegment_, toolTip != null ? toolTip.id : 0, segment);
 }
 
-public void setTrackingMode(long /*int*/ trackingMode) {
+public void setTrackingMode(long trackingMode) {
 	OS.objc_msgSend(this.id, OS.sel_setTrackingMode_, trackingMode);
 }
 
-public void setWidth(double /*float*/ width, long /*int*/ segment) {
+public void setWidth(double width, long segment) {
 	OS.objc_msgSend(this.id, OS.sel_setWidth_forSegment_, width, segment);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java
index e233b15315..ec578dd2d6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSet.java
@@ -19,7 +19,7 @@ public NSSet() {
 	super();
 }
 
-public NSSet(long /*int*/ id) {
+public NSSet(long id) {
 	super(id);
 }
 
@@ -28,21 +28,21 @@ public NSSet(id id) {
 }
 
 public NSArray allObjects() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_allObjects);
+	long result = OS.objc_msgSend(this.id, OS.sel_allObjects);
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public long /*int*/ count() {
+public long count() {
 	return OS.objc_msgSend(this.id, OS.sel_count);
 }
 
 public NSEnumerator objectEnumerator() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
+	long result = OS.objc_msgSend(this.id, OS.sel_objectEnumerator);
 	return result != 0 ? new NSEnumerator(result) : null;
 }
 
 public static NSSet set() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSSet, OS.sel_set);
+	long result = OS.objc_msgSend(OS.class_NSSet, OS.sel_set);
 	return result != 0 ? new NSSet(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java
index 044949eadd..8b3ced44d5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java
@@ -15,9 +15,9 @@ package org.eclipse.swt.internal.cocoa;
 
 public class NSSize {
 	/** @field cast=(CGFloat) */
-	public double /*float*/ width;
+	public double width;
 	/** @field cast=(CGFloat) */
-	public double /*float*/ height;
+	public double height;
 	public static final int sizeof = OS.NSSize_sizeof();
 
 	@Override
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java
index 805e1b65f8..4dd554b90e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSSlider() {
 	super();
 }
 
-public NSSlider(long /*int*/ id) {
+public NSSlider(long id) {
 	super(id);
 }
 
@@ -27,8 +27,8 @@ public NSSlider(id id) {
 	super(id);
 }
 
-public double /*float*/ knobThickness() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_knobThickness);
+public double knobThickness() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_knobThickness);
 }
 
 public double maxValue() {
@@ -47,11 +47,11 @@ public void setMinValue(double minValue) {
 	OS.objc_msgSend(this.id, OS.sel_setMinValue_, minValue);
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSSlider, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSSlider, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusBar.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusBar.java
index b54ea44084..5c3d40ed22 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusBar.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSStatusBar() {
 	super();
 }
 
-public NSStatusBar(long /*int*/ id) {
+public NSStatusBar(long id) {
 	super(id);
 }
 
@@ -31,18 +31,18 @@ public void removeStatusItem(NSStatusItem item) {
 	OS.objc_msgSend(this.id, OS.sel_removeStatusItem_, item != null ? item.id : 0);
 }
 
-public NSStatusItem statusItemWithLength(double /*float*/ length) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_statusItemWithLength_, length);
+public NSStatusItem statusItemWithLength(double length) {
+	long result = OS.objc_msgSend(this.id, OS.sel_statusItemWithLength_, length);
 	return result != 0 ? new NSStatusItem(result) : null;
 }
 
 public static NSStatusBar systemStatusBar() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSStatusBar, OS.sel_systemStatusBar);
+	long result = OS.objc_msgSend(OS.class_NSStatusBar, OS.sel_systemStatusBar);
 	return result != 0 ? new NSStatusBar(result) : null;
 }
 
-public double /*float*/ thickness() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_thickness);
+public double thickness() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_thickness);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java
index fad04a20e9..ad4379074c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStatusItem.java
@@ -19,7 +19,7 @@ public NSStatusItem() {
 	super();
 }
 
-public NSStatusItem(long /*int*/ id) {
+public NSStatusItem(long id) {
 	super(id);
 }
 
@@ -39,7 +39,7 @@ public void setHighlightMode(boolean highlightMode) {
 	OS.objc_msgSend(this.id, OS.sel_setHighlightMode_, highlightMode);
 }
 
-public void setLength(double /*float*/ length) {
+public void setLength(double length) {
 	OS.objc_msgSend(this.id, OS.sel_setLength_, length);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepper.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepper.java
index 60ef9fbb40..1cf28e08bf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepper.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSStepper.java
@@ -19,7 +19,7 @@ public NSStepper() {
 	super();
 }
 
-public NSStepper(long /*int*/ id) {
+public NSStepper(long id) {
 	super(id);
 }
 
@@ -55,11 +55,11 @@ public void setValueWraps(boolean valueWraps) {
 	OS.objc_msgSend(this.id, OS.sel_setValueWraps_, valueWraps);
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSStepper, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSStepper, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java
index 3c43d86c29..c62c655d4f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java
@@ -19,7 +19,7 @@ public NSString() {
 	super();
 }
 
-public NSString(long /*int*/ id) {
+public NSString(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSString(id id) {
 }
 
 public String getString() {
-	char[] buffer = new char[(int)/*64*/length()];
+	char[] buffer = new char[(int)length()];
 	getCharacters(buffer);
 	return new String(buffer);
 }
@@ -45,19 +45,19 @@ public static NSString stringWith(String str) {
 	return stringWithCharacters(buffer, buffer.length);
 }
 
-public long /*int*/ UTF8String() {
+public long UTF8String() {
 	return OS.objc_msgSend(this.id, OS.sel_UTF8String);
 }
 
-public long /*int*/ characterAtIndex(long /*int*/ index) {
+public long characterAtIndex(long index) {
 	return OS.objc_msgSend(this.id, OS.sel_characterAtIndex_, index);
 }
 
-public long /*int*/ compare(NSString string) {
+public long compare(NSString string) {
 	return OS.objc_msgSend(this.id, OS.sel_compare_, string != null ? string.id : 0);
 }
 
-public long /*int*/ fileSystemRepresentation() {
+public long fileSystemRepresentation() {
 	return OS.objc_msgSend(this.id, OS.sel_fileSystemRepresentation);
 }
 
@@ -69,8 +69,8 @@ public void getCharacters(char[] buffer, NSRange range) {
 	OS.objc_msgSend(this.id, OS.sel_getCharacters_range_, buffer, range);
 }
 
-public NSString initWithCharacters(char[] characters, long /*int*/ length) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithCharacters_length_, characters, length);
+public NSString initWithCharacters(char[] characters, long length) {
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithCharacters_length_, characters, length);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
@@ -79,76 +79,76 @@ public boolean isEqualToString(NSString aString) {
 }
 
 public NSString lastPathComponent() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_lastPathComponent);
+	long result = OS.objc_msgSend(this.id, OS.sel_lastPathComponent);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
-public long /*int*/ length() {
+public long length() {
 	return OS.objc_msgSend(this.id, OS.sel_length);
 }
 
 public NSString lowercaseString() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_lowercaseString);
+	long result = OS.objc_msgSend(this.id, OS.sel_lowercaseString);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
 public NSString pathExtension() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_pathExtension);
+	long result = OS.objc_msgSend(this.id, OS.sel_pathExtension);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
 public static NSString string() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_string);
+	long result = OS.objc_msgSend(OS.class_NSString, OS.sel_string);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public NSString stringByAddingPercentEscapesUsingEncoding(long /*int*/ enc) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAddingPercentEscapesUsingEncoding_, enc);
+public NSString stringByAddingPercentEscapesUsingEncoding(long enc) {
+	long result = OS.objc_msgSend(this.id, OS.sel_stringByAddingPercentEscapesUsingEncoding_, enc);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
 public NSString stringByAppendingPathComponent(NSString str) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingPathComponent_, str != null ? str.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingPathComponent_, str != null ? str.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
 public NSString stringByAppendingPathExtension(NSString str) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingPathExtension_, str != null ? str.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingPathExtension_, str != null ? str.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
 public NSString stringByAppendingString(NSString aString) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingString_, aString != null ? aString.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_stringByAppendingString_, aString != null ? aString.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
 public NSString stringByDeletingLastPathComponent() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByDeletingLastPathComponent);
+	long result = OS.objc_msgSend(this.id, OS.sel_stringByDeletingLastPathComponent);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
 public NSString stringByDeletingPathExtension() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByDeletingPathExtension);
+	long result = OS.objc_msgSend(this.id, OS.sel_stringByDeletingPathExtension);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
 public NSString stringByReplacingOccurrencesOfString(NSString target, NSString replacement) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingOccurrencesOfString_withString_, target != null ? target.id : 0, replacement != null ? replacement.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingOccurrencesOfString_withString_, target != null ? target.id : 0, replacement != null ? replacement.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
-public NSString stringByReplacingPercentEscapesUsingEncoding(long /*int*/ enc) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingPercentEscapesUsingEncoding_, enc);
+public NSString stringByReplacingPercentEscapesUsingEncoding(long enc) {
+	long result = OS.objc_msgSend(this.id, OS.sel_stringByReplacingPercentEscapesUsingEncoding_, enc);
 	return result == this.id ? this : (result != 0 ? new NSString(result) : null);
 }
 
-public static NSString stringWithCharacters(char[] characters, long /*int*/ length) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithCharacters_length_, characters, length);
+public static NSString stringWithCharacters(char[] characters, long length) {
+	long result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithCharacters_length_, characters, length);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public static NSString stringWithUTF8String(long /*int*/ nullTerminatedCString) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithUTF8String_, nullTerminatedCString);
+public static NSString stringWithUTF8String(long nullTerminatedCString) {
+	long result = OS.objc_msgSend(OS.class_NSString, OS.sel_stringWithUTF8String_, nullTerminatedCString);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java
index 546d6d9108..1124d28660 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java
@@ -19,7 +19,7 @@ public NSTabView() {
 	super();
 }
 
-public NSTabView(long /*int*/ id) {
+public NSTabView(long id) {
 	super(id);
 }
 
@@ -37,7 +37,7 @@ public NSRect contentRect() {
 	return result;
 }
 
-public void insertTabViewItem(NSTabViewItem tabViewItem, long /*int*/ index) {
+public void insertTabViewItem(NSTabViewItem tabViewItem, long index) {
 	OS.objc_msgSend(this.id, OS.sel_insertTabViewItem_atIndex_, tabViewItem != null ? tabViewItem.id : 0, index);
 }
 
@@ -51,16 +51,16 @@ public void removeTabViewItem(NSTabViewItem tabViewItem) {
 	OS.objc_msgSend(this.id, OS.sel_removeTabViewItem_, tabViewItem != null ? tabViewItem.id : 0);
 }
 
-public void selectTabViewItemAtIndex(long /*int*/ index) {
+public void selectTabViewItemAtIndex(long index) {
 	OS.objc_msgSend(this.id, OS.sel_selectTabViewItemAtIndex_, index);
 }
 
 public NSTabViewItem selectedTabViewItem() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_selectedTabViewItem);
+	long result = OS.objc_msgSend(this.id, OS.sel_selectedTabViewItem);
 	return result != 0 ? new NSTabViewItem(result) : null;
 }
 
-public void setControlSize(long /*int*/ controlSize) {
+public void setControlSize(long controlSize) {
 	OS.objc_msgSend(this.id, OS.sel_setControlSize_, controlSize);
 }
 
@@ -72,12 +72,12 @@ public void setFont(NSFont font) {
 	OS.objc_msgSend(this.id, OS.sel_setFont_, font != null ? font.id : 0);
 }
 
-public void setTabViewType(long /*int*/ tabViewType) {
+public void setTabViewType(long tabViewType) {
 	OS.objc_msgSend(this.id, OS.sel_setTabViewType_, tabViewType);
 }
 
 public NSTabViewItem tabViewItemAtPoint(NSPoint point) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_tabViewItemAtPoint_, point);
+	long result = OS.objc_msgSend(this.id, OS.sel_tabViewItemAtPoint_, point);
 	return result != 0 ? new NSTabViewItem(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java
index 854f4d8934..b8724f08b3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java
@@ -19,7 +19,7 @@ public NSTabViewItem() {
 	super();
 }
 
-public NSTabViewItem(long /*int*/ id) {
+public NSTabViewItem(long id) {
 	super(id);
 }
 
@@ -32,7 +32,7 @@ public void drawLabel(boolean shouldTruncateLabel, NSRect labelRect) {
 }
 
 public NSTabViewItem initWithIdentifier(id identifier) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSTabViewItem(result) : null);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java
index 706808b2e6..43f605d20e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2018 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSTableColumn() {
 	super();
 }
 
-public NSTableColumn(long /*int*/ id) {
+public NSTableColumn(long id) {
 	super(id);
 }
 
@@ -28,21 +28,21 @@ public NSTableColumn(id id) {
 }
 
 public NSCell dataCell() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dataCell);
+	long result = OS.objc_msgSend(this.id, OS.sel_dataCell);
 	return result != 0 ? new NSCell(result) : null;
 }
 
 public NSTableHeaderCell headerCell() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_headerCell);
+	long result = OS.objc_msgSend(this.id, OS.sel_headerCell);
 	return result != 0 ? new NSTableHeaderCell(result) : null;
 }
 
 public NSTableColumn initWithIdentifier(NSString identifier) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSTableColumn(result) : null);
 }
 
-public long /*int*/ resizingMask() {
+public long resizingMask() {
 	return OS.objc_msgSend(this.id, OS.sel_resizingMask);
 }
 
@@ -62,20 +62,20 @@ public void setIdentifier(NSString identifier) {
 	OS.objc_msgSend(this.id, OS.sel_setIdentifier_, identifier != null ? identifier.id : 0);
 }
 
-public void setMinWidth(double /*float*/ minWidth) {
+public void setMinWidth(double minWidth) {
 	OS.objc_msgSend(this.id, OS.sel_setMinWidth_, minWidth);
 }
 
-public void setResizingMask(long /*int*/ resizingMask) {
+public void setResizingMask(long resizingMask) {
 	OS.objc_msgSend(this.id, OS.sel_setResizingMask_, resizingMask);
 }
 
-public void setWidth(double /*float*/ width) {
+public void setWidth(double width) {
 	OS.objc_msgSend(this.id, OS.sel_setWidth_, width);
 }
 
-public double /*float*/ width() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_width);
+public double width() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_width);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderCell.java
index 20f25d91d0..0082dff3a6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderCell.java
@@ -19,7 +19,7 @@ public NSTableHeaderCell() {
 	super();
 }
 
-public NSTableHeaderCell(long /*int*/ id) {
+public NSTableHeaderCell(long id) {
 	super(id);
 }
 
@@ -27,7 +27,7 @@ public NSTableHeaderCell(id id) {
 	super(id);
 }
 
-public void drawSortIndicatorWithFrame(NSRect cellFrame, NSView controlView, boolean ascending, long /*int*/ priority) {
+public void drawSortIndicatorWithFrame(NSRect cellFrame, NSView controlView, boolean ascending, long priority) {
 	OS.objc_msgSend(this.id, OS.sel_drawSortIndicatorWithFrame_inView_ascending_priority_, cellFrame, controlView != null ? controlView.id : 0, ascending, priority);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderView.java
index b9c457a97a..a81906cef5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableHeaderView.java
@@ -19,7 +19,7 @@ public NSTableHeaderView() {
 	super();
 }
 
-public NSTableHeaderView(long /*int*/ id) {
+public NSTableHeaderView(long id) {
 	super(id);
 }
 
@@ -27,11 +27,11 @@ public NSTableHeaderView(id id) {
 	super(id);
 }
 
-public long /*int*/ columnAtPoint(NSPoint point) {
+public long columnAtPoint(NSPoint point) {
 	return OS.objc_msgSend(this.id, OS.sel_columnAtPoint_, point);
 }
 
-public NSRect headerRectOfColumn(long /*int*/ column) {
+public NSRect headerRectOfColumn(long column) {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_headerRectOfColumn_, column);
 	return result;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
index d7e69ca523..d71c54c320 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSTableView() {
 	super();
 }
 
-public NSTableView(long /*int*/ id) {
+public NSTableView(long id) {
 	super(id);
 }
 
@@ -39,24 +39,24 @@ public boolean canDragRowsWithIndexes(NSIndexSet rowIndexes, NSPoint mouseDownPo
 	return OS.objc_msgSend_bool(this.id, OS.sel_canDragRowsWithIndexes_atPoint_, rowIndexes != null ? rowIndexes.id : 0, mouseDownPoint);
 }
 
-public long /*int*/ clickedColumn() {
+public long clickedColumn() {
 	return OS.objc_msgSend(this.id, OS.sel_clickedColumn);
 }
 
-public long /*int*/ clickedRow() {
+public long clickedRow() {
 	return OS.objc_msgSend(this.id, OS.sel_clickedRow);
 }
 
-public long /*int*/ columnAtPoint(NSPoint point) {
+public long columnAtPoint(NSPoint point) {
 	return OS.objc_msgSend(this.id, OS.sel_columnAtPoint_, point);
 }
 
 public NSIndexSet columnIndexesInRect(NSRect rect) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_columnIndexesInRect_, rect);
+	long result = OS.objc_msgSend(this.id, OS.sel_columnIndexesInRect_, rect);
 	return result != 0 ? new NSIndexSet(result) : null;
 }
 
-public long /*int*/ columnWithIdentifier(NSString identifier) {
+public long columnWithIdentifier(NSString identifier) {
 	return OS.objc_msgSend(this.id, OS.sel_columnWithIdentifier_, identifier != null ? identifier.id : 0);
 }
 
@@ -64,12 +64,12 @@ public void deselectAll(id sender) {
 	OS.objc_msgSend(this.id, OS.sel_deselectAll_, sender != null ? sender.id : 0);
 }
 
-public void deselectRow(long /*int*/ row) {
+public void deselectRow(long row) {
 	OS.objc_msgSend(this.id, OS.sel_deselectRow_, row);
 }
 
-public NSImage dragImageForRowsWithIndexes(NSIndexSet dragRows, NSArray tableColumns, NSEvent dragEvent, long /*int*/ dragImageOffset) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dragImageForRowsWithIndexes_tableColumns_event_offset_, dragRows != null ? dragRows.id : 0, tableColumns != null ? tableColumns.id : 0, dragEvent != null ? dragEvent.id : 0, dragImageOffset);
+public NSImage dragImageForRowsWithIndexes(NSIndexSet dragRows, NSArray tableColumns, NSEvent dragEvent, long dragImageOffset) {
+	long result = OS.objc_msgSend(this.id, OS.sel_dragImageForRowsWithIndexes_tableColumns_event_offset_, dragRows != null ? dragRows.id : 0, tableColumns != null ? tableColumns.id : 0, dragEvent != null ? dragEvent.id : 0, dragImageOffset);
 	return result != 0 ? new NSImage(result) : null;
 }
 
@@ -77,14 +77,14 @@ public void drawBackgroundInClipRect(NSRect clipRect) {
 	OS.objc_msgSend(this.id, OS.sel_drawBackgroundInClipRect_, clipRect);
 }
 
-public NSRect frameOfCellAtColumn(long /*int*/ column, long /*int*/ row) {
+public NSRect frameOfCellAtColumn(long column, long row) {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_frameOfCellAtColumn_row_, column, row);
 	return result;
 }
 
 public NSTableHeaderView headerView() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_headerView);
+	long result = OS.objc_msgSend(this.id, OS.sel_headerView);
 	return result != 0 ? new NSTableHeaderView(result) : null;
 }
 
@@ -98,11 +98,11 @@ public NSSize intercellSpacing() {
 	return result;
 }
 
-public boolean isRowSelected(long /*int*/ row) {
+public boolean isRowSelected(long row) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_isRowSelected_, row);
 }
 
-public void moveColumn(long /*int*/ column, long /*int*/ newIndex) {
+public void moveColumn(long column, long newIndex) {
 	OS.objc_msgSend(this.id, OS.sel_moveColumn_toColumn_, column, newIndex);
 }
 
@@ -110,30 +110,30 @@ public void noteNumberOfRowsChanged() {
 	OS.objc_msgSend(this.id, OS.sel_noteNumberOfRowsChanged);
 }
 
-public long /*int*/ numberOfColumns() {
+public long numberOfColumns() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfColumns);
 }
 
-public long /*int*/ numberOfRows() {
+public long numberOfRows() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfRows);
 }
 
-public long /*int*/ numberOfSelectedRows() {
+public long numberOfSelectedRows() {
 	return OS.objc_msgSend(this.id, OS.sel_numberOfSelectedRows);
 }
 
-public NSCell preparedCellAtColumn(long /*int*/ column, long /*int*/ row) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_preparedCellAtColumn_row_, column, row);
+public NSCell preparedCellAtColumn(long column, long row) {
+	long result = OS.objc_msgSend(this.id, OS.sel_preparedCellAtColumn_row_, column, row);
 	return result != 0 ? new NSCell(result) : null;
 }
 
-public NSRect rectOfColumn(long /*int*/ column) {
+public NSRect rectOfColumn(long column) {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfColumn_, column);
 	return result;
 }
 
-public NSRect rectOfRow(long /*int*/ row) {
+public NSRect rectOfRow(long row) {
 	NSRect result = new NSRect();
 	OS.objc_msgSend_stret(result, this.id, OS.sel_rectOfRow_, row);
 	return result;
@@ -147,12 +147,12 @@ public void removeTableColumn(NSTableColumn column) {
 	OS.objc_msgSend(this.id, OS.sel_removeTableColumn_, column != null ? column.id : 0);
 }
 
-public long /*int*/ rowAtPoint(NSPoint point) {
+public long rowAtPoint(NSPoint point) {
 	return OS.objc_msgSend(this.id, OS.sel_rowAtPoint_, point);
 }
 
-public double /*float*/ rowHeight() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_rowHeight);
+public double rowHeight() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_rowHeight);
 }
 
 public NSRange rowsInRect(NSRect rect) {
@@ -161,11 +161,11 @@ public NSRange rowsInRect(NSRect rect) {
 	return result;
 }
 
-public void scrollColumnToVisible(long /*int*/ column) {
+public void scrollColumnToVisible(long column) {
 	OS.objc_msgSend(this.id, OS.sel_scrollColumnToVisible_, column);
 }
 
-public void scrollRowToVisible(long /*int*/ row) {
+public void scrollRowToVisible(long row) {
 	OS.objc_msgSend(this.id, OS.sel_scrollRowToVisible_, row);
 }
 
@@ -177,12 +177,12 @@ public void selectRowIndexes(NSIndexSet indexes, boolean extend) {
 	OS.objc_msgSend(this.id, OS.sel_selectRowIndexes_byExtendingSelection_, indexes != null ? indexes.id : 0, extend);
 }
 
-public long /*int*/ selectedRow() {
+public long selectedRow() {
 	return OS.objc_msgSend(this.id, OS.sel_selectedRow);
 }
 
 public NSIndexSet selectedRowIndexes() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_selectedRowIndexes);
+	long result = OS.objc_msgSend(this.id, OS.sel_selectedRowIndexes);
 	return result != 0 ? new NSIndexSet(result) : null;
 }
 
@@ -198,7 +198,7 @@ public void setBackgroundColor(NSColor backgroundColor) {
 	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, backgroundColor != null ? backgroundColor.id : 0);
 }
 
-public void setColumnAutoresizingStyle(long /*int*/ columnAutoresizingStyle) {
+public void setColumnAutoresizingStyle(long columnAutoresizingStyle) {
 	OS.objc_msgSend(this.id, OS.sel_setColumnAutoresizingStyle_, columnAutoresizingStyle);
 }
 
@@ -210,15 +210,15 @@ public void setDelegate(id delegate) {
 	OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0);
 }
 
-public void setDoubleAction(long /*int*/ doubleAction) {
+public void setDoubleAction(long doubleAction) {
 	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_, doubleAction);
 }
 
-public void setDropRow(long /*int*/ row, long /*int*/ op) {
+public void setDropRow(long row, long op) {
 	OS.objc_msgSend(this.id, OS.sel_setDropRow_dropOperation_, row, op);
 }
 
-public void setGridStyleMask(long /*int*/ gridStyle) {
+public void setGridStyleMask(long gridStyle) {
 	OS.objc_msgSend(this.id, OS.sel_setGridStyleMask_, gridStyle);
 }
 
@@ -238,7 +238,7 @@ public void setIntercellSpacing(NSSize intercellSpacing) {
 	OS.objc_msgSend(this.id, OS.sel_setIntercellSpacing_, intercellSpacing);
 }
 
-public void setRowHeight(double /*float*/ rowHeight) {
+public void setRowHeight(double rowHeight) {
 	OS.objc_msgSend(this.id, OS.sel_setRowHeight_, rowHeight);
 }
 
@@ -247,7 +247,7 @@ public void setUsesAlternatingRowBackgroundColors(boolean usesAlternatingRowBack
 }
 
 public NSArray tableColumns() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_tableColumns);
+	long result = OS.objc_msgSend(this.id, OS.sel_tableColumns);
 	return result != 0 ? new NSArray(result) : null;
 }
 
@@ -259,11 +259,11 @@ public boolean usesAlternatingRowBackgroundColors() {
 	return OS.objc_msgSend_bool(this.id, OS.sel_usesAlternatingRowBackgroundColors);
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSTableView, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSTableView, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java
index 73787900da..3b17af3a33 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java
@@ -19,7 +19,7 @@ public NSText() {
 	super();
 }
 
-public NSText(long /*int*/ id) {
+public NSText(long id) {
 	super(id);
 }
 
@@ -36,12 +36,12 @@ public void cut(id sender) {
 }
 
 public id delegate() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_delegate);
+	long result = OS.objc_msgSend(this.id, OS.sel_delegate);
 	return result != 0 ? new id(result) : null;
 }
 
 public NSFont font() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_font);
+	long result = OS.objc_msgSend(this.id, OS.sel_font);
 	return result != 0 ? new NSFont(result) : null;
 }
 
@@ -71,7 +71,7 @@ public NSRange selectedRange() {
 	return result;
 }
 
-public void setAlignment(long /*int*/ alignment) {
+public void setAlignment(long alignment) {
 	OS.objc_msgSend(this.id, OS.sel_setAlignment_, alignment);
 }
 
@@ -79,7 +79,7 @@ public void setBackgroundColor(NSColor backgroundColor) {
 	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, backgroundColor != null ? backgroundColor.id : 0);
 }
 
-public void setBaseWritingDirection(long /*int*/ baseWritingDirection) {
+public void setBaseWritingDirection(long baseWritingDirection) {
 	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, baseWritingDirection);
 }
 
@@ -132,7 +132,7 @@ public void sizeToFit() {
 }
 
 public NSString string() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_string);
+	long result = OS.objc_msgSend(this.id, OS.sel_string);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java
index 9fd9c1741a..2068be7c07 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java
@@ -19,7 +19,7 @@ public NSTextAttachment() {
 	super();
 }
 
-public NSTextAttachment(long /*int*/ id) {
+public NSTextAttachment(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSTextAttachment(id id) {
 }
 
 public NSTextAttachment initWithFileWrapper(NSFileWrapper fileWrapper) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFileWrapper_, fileWrapper != null ? fileWrapper.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithFileWrapper_, fileWrapper != null ? fileWrapper.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSTextAttachment(result) : null);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java
index b926a84083..0ad59fd81a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java
@@ -19,7 +19,7 @@ public NSTextContainer() {
 	super();
 }
 
-public NSTextContainer(long /*int*/ id) {
+public NSTextContainer(long id) {
 	super(id);
 }
 
@@ -34,7 +34,7 @@ public NSSize containerSize() {
 }
 
 public NSTextContainer initWithContainerSize(NSSize aContainerSize) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSize_, aContainerSize);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSize_, aContainerSize);
 	return result == this.id ? this : (result != 0 ? new NSTextContainer(result) : null);
 }
 
@@ -42,7 +42,7 @@ public void setContainerSize(NSSize containerSize) {
 	OS.objc_msgSend(this.id, OS.sel_setContainerSize_, containerSize);
 }
 
-public void setLineFragmentPadding(double /*float*/ lineFragmentPadding) {
+public void setLineFragmentPadding(double lineFragmentPadding) {
 	OS.objc_msgSend(this.id, OS.sel_setLineFragmentPadding_, lineFragmentPadding);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java
index 5ecb8bc882..1a88102092 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java
@@ -19,7 +19,7 @@ public NSTextField() {
 	super();
 }
 
-public NSTextField(long /*int*/ id) {
+public NSTextField(long id) {
 	super(id);
 }
 
@@ -59,11 +59,11 @@ public void setTextColor(NSColor textColor) {
 	OS.objc_msgSend(this.id, OS.sel_setTextColor_, textColor != null ? textColor.id : 0);
 }
 
-public static long /*int*/ cellClass() {
+public static long cellClass() {
 	return OS.objc_msgSend(OS.class_NSTextField, OS.sel_cellClass);
 }
 
-public static void setCellClass(long /*int*/ factoryId) {
+public static void setCellClass(long factoryId) {
 	OS.objc_msgSend(OS.class_NSTextField, OS.sel_setCellClass_, factoryId);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java
index 9fc957b4e8..2351cffa22 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java
@@ -19,7 +19,7 @@ public NSTextFieldCell() {
 	super();
 }
 
-public NSTextFieldCell(long /*int*/ id) {
+public NSTextFieldCell(long id) {
 	super(id);
 }
 
@@ -36,7 +36,7 @@ public void setTextColor(NSColor textColor) {
 }
 
 public NSColor textColor() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_textColor);
+	long result = OS.objc_msgSend(this.id, OS.sel_textColor);
 	return result != 0 ? new NSColor(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java
index 34c5b9cc6f..f720ac3da7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java
@@ -19,7 +19,7 @@ public NSTextStorage() {
 	super();
 }
 
-public NSTextStorage(long /*int*/ id) {
+public NSTextStorage(long id) {
 	super(id);
 }
 
@@ -32,12 +32,12 @@ public void addLayoutManager(NSLayoutManager aLayoutManager) {
 }
 
 public NSArray paragraphs() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_paragraphs);
+	long result = OS.objc_msgSend(this.id, OS.sel_paragraphs);
 	return result != 0 ? new NSArray(result) : null;
 }
 
 public static NSAttributedString attributedStringWithAttachment(NSTextAttachment attachment) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSTextStorage, OS.sel_attributedStringWithAttachment_, attachment != null ? attachment.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSTextStorage, OS.sel_attributedStringWithAttachment_, attachment != null ? attachment.id : 0);
 	return result != 0 ? new NSAttributedString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java
index 8416a9c115..76320d3f52 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextTab.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSTextTab() {
 	super();
 }
 
-public NSTextTab(long /*int*/ id) {
+public NSTextTab(long id) {
 	super(id);
 }
 
@@ -27,16 +27,16 @@ public NSTextTab(id id) {
 	super(id);
 }
 
-public NSTextTab initWithType(long /*int*/ type, double /*float*/ loc) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithType_location_, type, loc);
+public NSTextTab initWithType(long type, double loc) {
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithType_location_, type, loc);
 	return result == this.id ? this : (result != 0 ? new NSTextTab(result) : null);
 }
 
-public double /*float*/ location() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_location);
+public double location() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_location);
 }
 
-public long /*int*/ tabStopType() {
+public long tabStopType() {
 	return OS.objc_msgSend(this.id, OS.sel_tabStopType);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java
index 7ac5f14993..f63ddcdf4c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java
@@ -19,7 +19,7 @@ public NSTextView() {
 	super();
 }
 
-public NSTextView(long /*int*/ id) {
+public NSTextView(long id) {
 	super(id);
 }
 
@@ -27,12 +27,12 @@ public NSTextView(id id) {
 	super(id);
 }
 
-public long /*int*/ characterIndexForInsertionAtPoint(NSPoint point) {
+public long characterIndexForInsertionAtPoint(NSPoint point) {
 	return OS.objc_msgSend(this.id, OS.sel_characterIndexForInsertionAtPoint_, point);
 }
 
 public NSParagraphStyle defaultParagraphStyle() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_defaultParagraphStyle);
+	long result = OS.objc_msgSend(this.id, OS.sel_defaultParagraphStyle);
 	return result != 0 ? new NSParagraphStyle(result) : null;
 }
 
@@ -45,22 +45,22 @@ public void drawViewBackgroundInRect(NSRect rect) {
 }
 
 public NSLayoutManager layoutManager() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_layoutManager);
+	long result = OS.objc_msgSend(this.id, OS.sel_layoutManager);
 	return result != 0 ? new NSLayoutManager(result) : null;
 }
 
 public NSDictionary linkTextAttributes() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_linkTextAttributes);
+	long result = OS.objc_msgSend(this.id, OS.sel_linkTextAttributes);
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
 public NSDictionary markedTextAttributes() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_markedTextAttributes);
+	long result = OS.objc_msgSend(this.id, OS.sel_markedTextAttributes);
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
 public NSDictionary selectedTextAttributes() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_selectedTextAttributes);
+	long result = OS.objc_msgSend(this.id, OS.sel_selectedTextAttributes);
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
@@ -68,7 +68,7 @@ public void setAllowsUndo(boolean allowsUndo) {
 	OS.objc_msgSend(this.id, OS.sel_setAllowsUndo_, allowsUndo);
 }
 
-public void setBaseWritingDirection(long /*int*/ writingDirection, NSRange range) {
+public void setBaseWritingDirection(long writingDirection, NSRange range) {
 	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_range_, writingDirection, range);
 }
 
@@ -105,12 +105,12 @@ public boolean shouldDrawInsertionPoint() {
 }
 
 public NSTextContainer textContainer() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_textContainer);
+	long result = OS.objc_msgSend(this.id, OS.sel_textContainer);
 	return result != 0 ? new NSTextContainer(result) : null;
 }
 
 public NSTextStorage textStorage() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_textStorage);
+	long result = OS.objc_msgSend(this.id, OS.sel_textStorage);
 	return result != 0 ? new NSTextStorage(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSThread.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSThread.java
index d270a14506..1f984bb22e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSThread.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSThread.java
@@ -19,7 +19,7 @@ public NSThread() {
 	super();
 }
 
-public NSThread(long /*int*/ id) {
+public NSThread(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSThread(id id) {
 }
 
 public static NSThread currentThread() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSThread, OS.sel_currentThread);
+	long result = OS.objc_msgSend(OS.class_NSThread, OS.sel_currentThread);
 	return result != 0 ? new NSThread(result) : null;
 }
 
@@ -37,7 +37,7 @@ public static boolean isMainThread() {
 }
 
 public NSMutableDictionary threadDictionary() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_threadDictionary);
+	long result = OS.objc_msgSend(this.id, OS.sel_threadDictionary);
 	return result != 0 ? new NSMutableDictionary(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimeZone.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimeZone.java
index d5c8c2205c..50bab513e7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimeZone.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimeZone.java
@@ -19,7 +19,7 @@ public NSTimeZone() {
 	super();
 }
 
-public NSTimeZone(long /*int*/ id) {
+public NSTimeZone(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSTimeZone(id id) {
 }
 
 public static NSTimeZone defaultTimeZone() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_defaultTimeZone);
+	long result = OS.objc_msgSend(OS.class_NSTimeZone, OS.sel_defaultTimeZone);
 	return result != 0 ? new NSTimeZone(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java
index 5daadef1ed..9737ea114c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java
@@ -19,7 +19,7 @@ public NSTimer() {
 	super();
 }
 
-public NSTimer(long /*int*/ id) {
+public NSTimer(long id) {
 	super(id);
 }
 
@@ -31,8 +31,8 @@ public void invalidate() {
 	OS.objc_msgSend(this.id, OS.sel_invalidate);
 }
 
-public static NSTimer scheduledTimerWithTimeInterval(double ti, id aTarget, long /*int*/ aSelector, id userInfo, boolean yesOrNo) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_, ti, aTarget != null ? aTarget.id : 0, aSelector, userInfo != null ? userInfo.id : 0, yesOrNo);
+public static NSTimer scheduledTimerWithTimeInterval(double ti, id aTarget, long aSelector, id userInfo, boolean yesOrNo) {
+	long result = OS.objc_msgSend(OS.class_NSTimer, OS.sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_, ti, aTarget != null ? aTarget.id : 0, aSelector, userInfo != null ? userInfo.id : 0, yesOrNo);
 	return result != 0 ? new NSTimer(result) : null;
 }
 
@@ -41,7 +41,7 @@ public void setFireDate(NSDate fireDate) {
 }
 
 public id userInfo() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo);
+	long result = OS.objc_msgSend(this.id, OS.sel_userInfo);
 	return result != 0 ? new id(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java
index ab5c502aee..8bb672f86d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java
@@ -19,7 +19,7 @@ public NSToolbar() {
 	super();
 }
 
-public NSToolbar(long /*int*/ id) {
+public NSToolbar(long id) {
 	super(id);
 }
 
@@ -28,11 +28,11 @@ public NSToolbar(id id) {
 }
 
 public NSToolbar initWithIdentifier(NSString identifier) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSToolbar(result) : null);
 }
 
-public void insertItemWithItemIdentifier(NSString itemIdentifier, long /*int*/ index) {
+public void insertItemWithItemIdentifier(NSString itemIdentifier, long index) {
 	OS.objc_msgSend(this.id, OS.sel_insertItemWithItemIdentifier_atIndex_, itemIdentifier != null ? itemIdentifier.id : 0, index);
 }
 
@@ -40,7 +40,7 @@ public boolean isVisible() {
 	return OS.objc_msgSend_bool(this.id, OS.sel_isVisible);
 }
 
-public void removeItemAtIndex(long /*int*/ index) {
+public void removeItemAtIndex(long index) {
 	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
 }
 
@@ -52,7 +52,7 @@ public void setDelegate(id delegate) {
 	OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0);
 }
 
-public void setDisplayMode(long /*int*/ displayMode) {
+public void setDisplayMode(long displayMode) {
 	OS.objc_msgSend(this.id, OS.sel_setDisplayMode_, displayMode);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java
index 8038be45a4..daa844438d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java
@@ -19,7 +19,7 @@ public NSToolbarItem() {
 	super();
 }
 
-public NSToolbarItem(long /*int*/ id) {
+public NSToolbarItem(long id) {
 	super(id);
 }
 
@@ -28,16 +28,16 @@ public NSToolbarItem(id id) {
 }
 
 public NSToolbarItem initWithItemIdentifier(NSString itemIdentifier) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithItemIdentifier_, itemIdentifier != null ? itemIdentifier.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithItemIdentifier_, itemIdentifier != null ? itemIdentifier.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSToolbarItem(result) : null);
 }
 
 public NSString itemIdentifier() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_itemIdentifier);
+	long result = OS.objc_msgSend(this.id, OS.sel_itemIdentifier);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public void setAction(long /*int*/ action) {
+public void setAction(long action) {
 	OS.objc_msgSend(this.id, OS.sel_setAction_, action);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTouch.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTouch.java
index 9ebbb49f3e..4fe6816d55 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTouch.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTouch.java
@@ -19,7 +19,7 @@ public NSTouch() {
 	super();
 }
 
-public NSTouch(long /*int*/ id) {
+public NSTouch(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public NSTouch(id id) {
 }
 
 public id device() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_device);
+	long result = OS.objc_msgSend(this.id, OS.sel_device);
 	return result != 0 ? new id(result) : null;
 }
 
@@ -48,7 +48,7 @@ public NSPoint normalizedPosition() {
 	return result;
 }
 
-public long /*int*/ phase() {
+public long phase() {
 	return OS.objc_msgSend(this.id, OS.sel_phase);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTrackingArea.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTrackingArea.java
index 04c02720d3..9623b2359a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTrackingArea.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTrackingArea.java
@@ -19,7 +19,7 @@ public NSTrackingArea() {
 	super();
 }
 
-public NSTrackingArea(long /*int*/ id) {
+public NSTrackingArea(long id) {
 	super(id);
 }
 
@@ -27,18 +27,18 @@ public NSTrackingArea(id id) {
 	super(id);
 }
 
-public NSTrackingArea initWithRect(NSRect rect, long /*int*/ options, id owner, NSDictionary userInfo) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithRect_options_owner_userInfo_, rect, options, owner != null ? owner.id : 0, userInfo != null ? userInfo.id : 0);
+public NSTrackingArea initWithRect(NSRect rect, long options, id owner, NSDictionary userInfo) {
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithRect_options_owner_userInfo_, rect, options, owner != null ? owner.id : 0, userInfo != null ? userInfo.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSTrackingArea(result) : null);
 }
 
 public id owner() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_owner);
+	long result = OS.objc_msgSend(this.id, OS.sel_owner);
 	return result != 0 ? new id(result) : null;
 }
 
 public NSDictionary userInfo() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_userInfo);
+	long result = OS.objc_msgSend(this.id, OS.sel_userInfo);
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java
index a8f5dd307e..1597ad35aa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTypesetter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSTypesetter() {
 	super();
 }
 
-public NSTypesetter(long /*int*/ id) {
+public NSTypesetter(long id) {
 	super(id);
 }
 
@@ -27,8 +27,8 @@ public NSTypesetter(id id) {
 	super(id);
 }
 
-public double /*float*/ baselineOffsetInLayoutManager(NSLayoutManager layoutMgr, long /*int*/ glyphIndex) {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_baselineOffsetInLayoutManager_glyphIndex_, layoutMgr != null ? layoutMgr.id : 0, glyphIndex);
+public double baselineOffsetInLayoutManager(NSLayoutManager layoutMgr, long glyphIndex) {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_baselineOffsetInLayoutManager_glyphIndex_, layoutMgr != null ? layoutMgr.id : 0, glyphIndex);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURL.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURL.java
index b5a32be426..1d90ef4505 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURL.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURL.java
@@ -19,7 +19,7 @@ public NSURL() {
 	super();
 }
 
-public NSURL(long /*int*/ id) {
+public NSURL(long id) {
 	super(id);
 }
 
@@ -28,27 +28,27 @@ public NSURL(id id) {
 }
 
 public static NSURL URLFromPasteboard(NSPasteboard pasteBoard) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLFromPasteboard_, pasteBoard != null ? pasteBoard.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLFromPasteboard_, pasteBoard != null ? pasteBoard.id : 0);
 	return result != 0 ? new NSURL(result) : null;
 }
 
 public static NSURL URLWithString(NSString URLString) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLWithString_, URLString != null ? URLString.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSURL, OS.sel_URLWithString_, URLString != null ? URLString.id : 0);
 	return result != 0 ? new NSURL(result) : null;
 }
 
 public NSString absoluteString() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_absoluteString);
+	long result = OS.objc_msgSend(this.id, OS.sel_absoluteString);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public static NSURL fileURLWithPath(NSString path) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSURL, OS.sel_fileURLWithPath_, path != null ? path.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSURL, OS.sel_fileURLWithPath_, path != null ? path.id : 0);
 	return result != 0 ? new NSURL(result) : null;
 }
 
 public NSString host() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_host);
+	long result = OS.objc_msgSend(this.id, OS.sel_host);
 	return result != 0 ? new NSString(result) : null;
 }
 
@@ -57,7 +57,7 @@ public boolean isFileURL() {
 }
 
 public NSString path() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_path);
+	long result = OS.objc_msgSend(this.id, OS.sel_path);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLAuthenticationChallenge.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLAuthenticationChallenge.java
index 7767670f8d..b75154f3ab 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLAuthenticationChallenge.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLAuthenticationChallenge.java
@@ -19,7 +19,7 @@ public NSURLAuthenticationChallenge() {
 	super();
 }
 
-public NSURLAuthenticationChallenge(long /*int*/ id) {
+public NSURLAuthenticationChallenge(long id) {
 	super(id);
 }
 
@@ -27,22 +27,22 @@ public NSURLAuthenticationChallenge(id id) {
 	super(id);
 }
 
-public long /*int*/ previousFailureCount() {
+public long previousFailureCount() {
 	return OS.objc_msgSend(this.id, OS.sel_previousFailureCount);
 }
 
 public NSURLCredential proposedCredential() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_proposedCredential);
+	long result = OS.objc_msgSend(this.id, OS.sel_proposedCredential);
 	return result != 0 ? new NSURLCredential(result) : null;
 }
 
 public NSURLProtectionSpace protectionSpace() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_protectionSpace);
+	long result = OS.objc_msgSend(this.id, OS.sel_protectionSpace);
 	return result != 0 ? new NSURLProtectionSpace(result) : null;
 }
 
 public id sender() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_sender);
+	long result = OS.objc_msgSend(this.id, OS.sel_sender);
 	return result != 0 ? new id(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredential.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredential.java
index be8396d84a..57702ab1bc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredential.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLCredential.java
@@ -19,7 +19,7 @@ public NSURLCredential() {
 	super();
 }
 
-public NSURLCredential(long /*int*/ id) {
+public NSURLCredential(long id) {
 	super(id);
 }
 
@@ -27,8 +27,8 @@ public NSURLCredential(id id) {
 	super(id);
 }
 
-public static NSURLCredential credentialWithUser(NSString user, NSString password, long /*int*/ persistence) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSURLCredential, OS.sel_credentialWithUser_password_persistence_, user != null ? user.id : 0, password != null ? password.id : 0, persistence);
+public static NSURLCredential credentialWithUser(NSString user, NSString password, long persistence) {
+	long result = OS.objc_msgSend(OS.class_NSURLCredential, OS.sel_credentialWithUser_password_persistence_, user != null ? user.id : 0, password != null ? password.id : 0, persistence);
 	return result != 0 ? new NSURLCredential(result) : null;
 }
 
@@ -37,12 +37,12 @@ public boolean hasPassword() {
 }
 
 public NSString password() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_password);
+	long result = OS.objc_msgSend(this.id, OS.sel_password);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public NSString user() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_user);
+	long result = OS.objc_msgSend(this.id, OS.sel_user);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLDownload.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLDownload.java
index 32b6810e34..9725e1e78d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLDownload.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLDownload.java
@@ -19,7 +19,7 @@ public NSURLDownload() {
 	super();
 }
 
-public NSURLDownload(long /*int*/ id) {
+public NSURLDownload(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtectionSpace.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtectionSpace.java
index bcf4a51275..47c6193cb4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtectionSpace.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLProtectionSpace.java
@@ -19,7 +19,7 @@ public NSURLProtectionSpace() {
 	super();
 }
 
-public NSURLProtectionSpace(long /*int*/ id) {
+public NSURLProtectionSpace(long id) {
 	super(id);
 }
 
@@ -28,16 +28,16 @@ public NSURLProtectionSpace(id id) {
 }
 
 public NSString host() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_host);
+	long result = OS.objc_msgSend(this.id, OS.sel_host);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public long /*int*/ port() {
+public long port() {
 	return OS.objc_msgSend(this.id, OS.sel_port);
 }
 
 public NSString realm() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_realm);
+	long result = OS.objc_msgSend(this.id, OS.sel_realm);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLRequest.java
index b11f977e40..1a16710a35 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLRequest.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSURLRequest.java
@@ -19,7 +19,7 @@ public NSURLRequest() {
 	super();
 }
 
-public NSURLRequest(long /*int*/ id) {
+public NSURLRequest(long id) {
 	super(id);
 }
 
@@ -28,17 +28,17 @@ public NSURLRequest(id id) {
 }
 
 public NSURL URL() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_URL);
+	long result = OS.objc_msgSend(this.id, OS.sel_URL);
 	return result != 0 ? new NSURL(result) : null;
 }
 
 public NSURLRequest initWithURL(NSURL URL) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithURL_, URL != null ? URL.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithURL_, URL != null ? URL.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSURLRequest(result) : null);
 }
 
 public static NSURLRequest requestWithURL(NSURL URL) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0);
+	long result = OS.objc_msgSend(OS.class_NSURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0);
 	return result != 0 ? new NSURLRequest(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUndoManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUndoManager.java
index 4f9fc34a1f..166b6c3c68 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUndoManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUndoManager.java
@@ -19,7 +19,7 @@ public NSUndoManager() {
 	super();
 }
 
-public NSUndoManager(long /*int*/ id) {
+public NSUndoManager(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaults.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaults.java
index ac5f8d059f..e1406f84ed 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaults.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSUserDefaults.java
@@ -19,7 +19,7 @@ public NSUserDefaults() {
 	super();
 }
 
-public NSUserDefaults(long /*int*/ id) {
+public NSUserDefaults(long id) {
 	super(id);
 }
 
@@ -28,21 +28,21 @@ public NSUserDefaults(id id) {
 }
 
 public id objectForKey(NSString defaultName) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_objectForKey_, defaultName != null ? defaultName.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_objectForKey_, defaultName != null ? defaultName.id : 0);
 	return result != 0 ? new id(result) : null;
 }
 
-public void setInteger(long /*int*/ value, NSString defaultName) {
+public void setInteger(long value, NSString defaultName) {
 	OS.objc_msgSend(this.id, OS.sel_setInteger_forKey_, value, defaultName != null ? defaultName.id : 0);
 }
 
 public static NSUserDefaults standardUserDefaults() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSUserDefaults, OS.sel_standardUserDefaults);
+	long result = OS.objc_msgSend(OS.class_NSUserDefaults, OS.sel_standardUserDefaults);
 	return result != 0 ? new NSUserDefaults(result) : null;
 }
 
 public NSString stringForKey(NSString defaultName) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_stringForKey_, defaultName != null ? defaultName.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_stringForKey_, defaultName != null ? defaultName.id : 0);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValue.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValue.java
index 411250b3c5..cb771f829c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValue.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSValue.java
@@ -19,7 +19,7 @@ public NSValue() {
 	super();
 }
 
-public NSValue(long /*int*/ id) {
+public NSValue(long id) {
 	super(id);
 }
 
@@ -27,7 +27,7 @@ public NSValue(id id) {
 	super(id);
 }
 
-public long /*int*/ objCType() {
+public long objCType() {
 	return OS.objc_msgSend(this.id, OS.sel_objCType);
 }
 
@@ -56,22 +56,22 @@ public NSSize sizeValue() {
 }
 
 public static NSValue valueWithPoint(NSPoint point) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithPoint_, point);
+	long result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithPoint_, point);
 	return result != 0 ? new NSValue(result) : null;
 }
 
 public static NSValue valueWithRange(NSRange range) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithRange_, range);
+	long result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithRange_, range);
 	return result != 0 ? new NSValue(result) : null;
 }
 
 public static NSValue valueWithRect(NSRect rect) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithRect_, rect);
+	long result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithRect_, rect);
 	return result != 0 ? new NSValue(result) : null;
 }
 
 public static NSValue valueWithSize(NSSize size) {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithSize_, size);
+	long result = OS.objc_msgSend(OS.class_NSValue, OS.sel_valueWithSize_, size);
 	return result != 0 ? new NSValue(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
index 8fdf2643c5..5f4f4d6614 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
@@ -19,7 +19,7 @@ public NSView() {
 	super();
 }
 
-public NSView(long /*int*/ id) {
+public NSView(long id) {
 	super(id);
 }
 
@@ -35,11 +35,11 @@ public void addSubview(NSView aView) {
 	OS.objc_msgSend(this.id, OS.sel_addSubview_, aView != null ? aView.id : 0);
 }
 
-public void addSubview(NSView aView, long /*int*/ place, NSView otherView) {
+public void addSubview(NSView aView, long place, NSView otherView) {
 	OS.objc_msgSend(this.id, OS.sel_addSubview_positioned_relativeTo_, aView != null ? aView.id : 0, place, otherView != null ? otherView.id : 0);
 }
 
-public long /*int*/ addToolTipRect(NSRect aRect, id anObject, long /*int*/ data) {
+public long addToolTipRect(NSRect aRect, id anObject, long data) {
 	return OS.objc_msgSend(this.id, OS.sel_addToolTipRect_owner_userData_, aRect, anObject != null ? anObject.id : 0, data);
 }
 
@@ -52,7 +52,7 @@ public void beginPageInRect(NSRect aRect, NSPoint location) {
 }
 
 public NSBitmapImageRep bitmapImageRepForCachingDisplayInRect(NSRect rect) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_bitmapImageRepForCachingDisplayInRect_, rect);
+	long result = OS.objc_msgSend(this.id, OS.sel_bitmapImageRepForCachingDisplayInRect_, rect);
 	return result != 0 ? new NSBitmapImageRep(result) : null;
 }
 
@@ -181,12 +181,12 @@ public NSRect frame() {
 }
 
 public NSView hitTest(NSPoint aPoint) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_hitTest_, aPoint);
+	long result = OS.objc_msgSend(this.id, OS.sel_hitTest_, aPoint);
 	return result == this.id ? this : (result != 0 ? new NSView(result) : null);
 }
 
 public NSView initWithFrame(NSRect frameRect) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_, frameRect);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_, frameRect);
 	return result == this.id ? this : (result != 0 ? new NSView(result) : null);
 }
 
@@ -215,7 +215,7 @@ public void lockFocus() {
 }
 
 public NSMenu menuForEvent(NSEvent event) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_menuForEvent_, event != null ? event.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_menuForEvent_, event != null ? event.id : 0);
 	return result != 0 ? new NSMenu(result) : null;
 }
 
@@ -239,7 +239,7 @@ public void removeFromSuperview() {
 	OS.objc_msgSend(this.id, OS.sel_removeFromSuperview);
 }
 
-public void removeToolTip(long /*int*/ tag) {
+public void removeToolTip(long tag) {
 	OS.objc_msgSend(this.id, OS.sel_removeToolTip_, tag);
 }
 
@@ -275,15 +275,15 @@ public void setAutoresizesSubviews(boolean autoresizesSubviews) {
 	OS.objc_msgSend(this.id, OS.sel_setAutoresizesSubviews_, autoresizesSubviews);
 }
 
-public void setAutoresizingMask(long /*int*/ autoresizingMask) {
+public void setAutoresizingMask(long autoresizingMask) {
 	OS.objc_msgSend(this.id, OS.sel_setAutoresizingMask_, autoresizingMask);
 }
 
-public void setBoundsRotation(double /*float*/ boundsRotation) {
+public void setBoundsRotation(double boundsRotation) {
 	OS.objc_msgSend(this.id, OS.sel_setBoundsRotation_, boundsRotation);
 }
 
-public void setFocusRingType(long /*int*/ focusRingType) {
+public void setFocusRingType(long focusRingType) {
 	OS.objc_msgSend(this.id, OS.sel_setFocusRingType_, focusRingType);
 }
 
@@ -324,17 +324,17 @@ public boolean shouldDelayWindowOrderingForEvent(NSEvent theEvent) {
 }
 
 public NSArray subviews() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_subviews);
+	long result = OS.objc_msgSend(this.id, OS.sel_subviews);
 	return result != 0 ? new NSArray(result) : null;
 }
 
 public NSView superview() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_superview);
+	long result = OS.objc_msgSend(this.id, OS.sel_superview);
 	return result == this.id ? this : (result != 0 ? new NSView(result) : null);
 }
 
 public NSArray trackingAreas() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_trackingAreas);
+	long result = OS.objc_msgSend(this.id, OS.sel_trackingAreas);
 	return result != 0 ? new NSArray(result) : null;
 }
 
@@ -365,7 +365,7 @@ public NSRect visibleRect() {
 }
 
 public NSWindow window() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_window);
+	long result = OS.objc_msgSend(this.id, OS.sel_window);
 	return result != 0 ? new NSWindow(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java
index 33dfabfbab..33a3b3f016 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2018 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public NSWindow() {
 	super();
 }
 
-public NSWindow(long /*int*/ id) {
+public NSWindow(long id) {
 	super(id);
 }
 
@@ -27,12 +27,12 @@ public NSWindow(id id) {
 	super(id);
 }
 
-public void addChildWindow(NSWindow childWin, long /*int*/ place) {
+public void addChildWindow(NSWindow childWin, long place) {
 	OS.objc_msgSend(this.id, OS.sel_addChildWindow_ordered_, childWin != null ? childWin.id : 0, place);
 }
 
-public double /*float*/ alphaValue() {
-	return (double /*float*/)OS.objc_msgSend_fpret(this.id, OS.sel_alphaValue);
+public double alphaValue() {
+	return OS.objc_msgSend_fpret(this.id, OS.sel_alphaValue);
 }
 
 public boolean areCursorRectsEnabled() {
@@ -57,12 +57,12 @@ public void close() {
 	OS.objc_msgSend(this.id, OS.sel_close);
 }
 
-public long /*int*/ collectionBehavior() {
+public long collectionBehavior() {
 	return OS.objc_msgSend(this.id, OS.sel_collectionBehavior);
 }
 
 public NSView contentView() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_contentView);
+	long result = OS.objc_msgSend(this.id, OS.sel_contentView);
 	return result != 0 ? new NSView(result) : null;
 }
 
@@ -79,12 +79,12 @@ public NSPoint convertScreenToBase(NSPoint aPoint) {
 }
 
 public NSButtonCell defaultButtonCell() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_defaultButtonCell);
+	long result = OS.objc_msgSend(this.id, OS.sel_defaultButtonCell);
 	return result != 0 ? new NSButtonCell(result) : null;
 }
 
 public id delegate() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_delegate);
+	long result = OS.objc_msgSend(this.id, OS.sel_delegate);
 	return result != 0 ? new id(result) : null;
 }
 
@@ -117,12 +117,12 @@ public void endEditingFor(id anObject) {
 }
 
 public NSText fieldEditor(boolean createFlag, id anObject) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_fieldEditor_forObject_, createFlag, anObject != null ? anObject.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_fieldEditor_forObject_, createFlag, anObject != null ? anObject.id : 0);
 	return result != 0 ? new NSText(result) : null;
 }
 
 public NSResponder firstResponder() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_firstResponder);
+	long result = OS.objc_msgSend(this.id, OS.sel_firstResponder);
 	return result != 0 ? new NSResponder(result) : null;
 }
 
@@ -143,7 +143,7 @@ public NSRect frameRectForContentRect(NSRect contentRect) {
 }
 
 public NSGraphicsContext graphicsContext() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_graphicsContext);
+	long result = OS.objc_msgSend(this.id, OS.sel_graphicsContext);
 	return result != 0 ? new NSGraphicsContext(result) : null;
 }
 
@@ -151,13 +151,13 @@ public boolean hasShadow() {
 	return OS.objc_msgSend_bool(this.id, OS.sel_hasShadow);
 }
 
-public NSWindow initWithContentRect(NSRect contentRect, long /*int*/ aStyle, long /*int*/ bufferingType, boolean flag) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_styleMask_backing_defer_, contentRect, aStyle, bufferingType, flag);
+public NSWindow initWithContentRect(NSRect contentRect, long aStyle, long bufferingType, boolean flag) {
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_styleMask_backing_defer_, contentRect, aStyle, bufferingType, flag);
 	return result == this.id ? this : (result != 0 ? new NSWindow(result) : null);
 }
 
-public NSWindow initWithContentRect(NSRect contentRect, long /*int*/ aStyle, long /*int*/ bufferingType, boolean flag, NSScreen screen) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_styleMask_backing_defer_screen_, contentRect, aStyle, bufferingType, flag, screen != null ? screen.id : 0);
+public NSWindow initWithContentRect(NSRect contentRect, long aStyle, long bufferingType, boolean flag, NSScreen screen) {
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithContentRect_styleMask_backing_defer_screen_, contentRect, aStyle, bufferingType, flag, screen != null ? screen.id : 0);
 	return result == this.id ? this : (result != 0 ? new NSWindow(result) : null);
 }
 
@@ -193,7 +193,7 @@ public boolean isZoomed() {
 	return OS.objc_msgSend_bool(this.id, OS.sel_isZoomed);
 }
 
-public long /*int*/ level() {
+public long level() {
 	return OS.objc_msgSend(this.id, OS.sel_level);
 }
 
@@ -205,8 +205,8 @@ public void makeKeyAndOrderFront(id sender) {
 	OS.objc_msgSend(this.id, OS.sel_makeKeyAndOrderFront_, sender != null ? sender.id : 0);
 }
 
-public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_NSWindow, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double minFrameWidthWithTitle(NSString aTitle, long aStyle) {
+	return OS.objc_msgSend_fpret(OS.class_NSWindow, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
 public NSSize minSize() {
@@ -241,12 +241,12 @@ public void orderOut(id sender) {
 	OS.objc_msgSend(this.id, OS.sel_orderOut_, sender != null ? sender.id : 0);
 }
 
-public void orderWindow(long /*int*/ place, long /*int*/ otherWin) {
+public void orderWindow(long place, long otherWin) {
 	OS.objc_msgSend(this.id, OS.sel_orderWindow_relativeTo_, place, otherWin);
 }
 
 public NSWindow parentWindow() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_parentWindow);
+	long result = OS.objc_msgSend(this.id, OS.sel_parentWindow);
 	return result == this.id ? this : (result != 0 ? new NSWindow(result) : null);
 }
 
@@ -255,7 +255,7 @@ public void removeChildWindow(NSWindow childWin) {
 }
 
 public NSScreen screen() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_screen);
+	long result = OS.objc_msgSend(this.id, OS.sel_screen);
 	return result != 0 ? new NSScreen(result) : null;
 }
 
@@ -267,7 +267,7 @@ public void setAcceptsMouseMovedEvents(boolean acceptsMouseMovedEvents) {
 	OS.objc_msgSend(this.id, OS.sel_setAcceptsMouseMovedEvents_, acceptsMouseMovedEvents);
 }
 
-public void setAlphaValue(double /*float*/ alphaValue) {
+public void setAlphaValue(double alphaValue) {
 	OS.objc_msgSend(this.id, OS.sel_setAlphaValue_, alphaValue);
 }
 
@@ -275,7 +275,7 @@ public void setBackgroundColor(NSColor backgroundColor) {
 	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, backgroundColor != null ? backgroundColor.id : 0);
 }
 
-public void setCollectionBehavior(long /*int*/ collectionBehavior) {
+public void setCollectionBehavior(long collectionBehavior) {
 	OS.objc_msgSend(this.id, OS.sel_setCollectionBehavior_, collectionBehavior);
 }
 
@@ -311,7 +311,7 @@ public void setHidesOnDeactivate(boolean hidesOnDeactivate) {
 	OS.objc_msgSend(this.id, OS.sel_setHidesOnDeactivate_, hidesOnDeactivate);
 }
 
-public void setLevel(long /*int*/ level) {
+public void setLevel(long level) {
 	OS.objc_msgSend(this.id, OS.sel_setLevel_, level);
 }
 
@@ -355,12 +355,12 @@ public void setToolbar(NSToolbar toolbar) {
 	OS.objc_msgSend(this.id, OS.sel_setToolbar_, toolbar != null ? toolbar.id : 0);
 }
 
-public NSButton standardWindowButton(long /*int*/ b) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_standardWindowButton_, b);
+public NSButton standardWindowButton(long b) {
+	long result = OS.objc_msgSend(this.id, OS.sel_standardWindowButton_, b);
 	return result != 0 ? new NSButton(result) : null;
 }
 
-public long /*int*/ styleMask() {
+public long styleMask() {
 	return OS.objc_msgSend(this.id, OS.sel_styleMask);
 }
 
@@ -369,19 +369,19 @@ public void toggleToolbarShown(id sender) {
 }
 
 public NSToolbar toolbar() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_toolbar);
+	long result = OS.objc_msgSend(this.id, OS.sel_toolbar);
 	return result != 0 ? new NSToolbar(result) : null;
 }
 
-public long /*int*/ windowNumber() {
+public long windowNumber() {
 	return OS.objc_msgSend(this.id, OS.sel_windowNumber);
 }
 
-public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
+public static long windowNumberAtPoint(NSPoint point, long windowNumber) {
 	return OS.objc_msgSend(OS.class_NSWindow, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
 }
 
-public long /*int*/ windowRef() {
+public long windowRef() {
 	return OS.objc_msgSend(this.id, OS.sel_windowRef);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWorkspace.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWorkspace.java
index b3aca12ef3..e6c185f8f2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWorkspace.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWorkspace.java
@@ -19,7 +19,7 @@ public NSWorkspace() {
 	super();
 }
 
-public NSWorkspace(long /*int*/ id) {
+public NSWorkspace(long id) {
 	super(id);
 }
 
@@ -28,21 +28,21 @@ public NSWorkspace(id id) {
 }
 
 public NSString fullPathForApplication(NSString appName) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_fullPathForApplication_, appName != null ? appName.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_fullPathForApplication_, appName != null ? appName.id : 0);
 	return result != 0 ? new NSString(result) : null;
 }
 
-public boolean getInfoForFile(NSString fullPath, long /*int*/ appName, long /*int*/ type) {
+public boolean getInfoForFile(NSString fullPath, long appName, long type) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_getInfoForFile_application_type_, fullPath != null ? fullPath.id : 0, appName, type);
 }
 
 public NSImage iconForFile(NSString fullPath) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_iconForFile_, fullPath != null ? fullPath.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_iconForFile_, fullPath != null ? fullPath.id : 0);
 	return result != 0 ? new NSImage(result) : null;
 }
 
 public NSImage iconForFileType(NSString fileType) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_iconForFileType_, fileType != null ? fileType.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_iconForFileType_, fileType != null ? fileType.id : 0);
 	return result != 0 ? new NSImage(result) : null;
 }
 
@@ -58,12 +58,12 @@ public boolean openURL(NSURL url) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_openURL_, url != null ? url.id : 0);
 }
 
-public boolean openURLs(NSArray urls, NSString bundleIdentifier, long /*int*/ options, NSAppleEventDescriptor descriptor, long /*int*/ identifiers) {
+public boolean openURLs(NSArray urls, NSString bundleIdentifier, long options, NSAppleEventDescriptor descriptor, long identifiers) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_openURLs_withAppBundleIdentifier_options_additionalEventParamDescriptor_launchIdentifiers_, urls != null ? urls.id : 0, bundleIdentifier != null ? bundleIdentifier.id : 0, options, descriptor != null ? descriptor.id : 0, identifiers);
 }
 
 public static NSWorkspace sharedWorkspace() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_NSWorkspace, OS.sel_sharedWorkspace);
+	long result = OS.objc_msgSend(OS.class_NSWorkspace, OS.sel_sharedWorkspace);
 	return result != 0 ? new NSWorkspace(result) : null;
 }
 
@@ -71,8 +71,8 @@ public boolean type(NSString firstTypeName, NSString secondTypeName) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_type_conformsToType_, firstTypeName != null ? firstTypeName.id : 0, secondTypeName != null ? secondTypeName.id : 0);
 }
 
-public NSString typeOfFile(NSString absoluteFilePath, long /*int*/ outError) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_typeOfFile_error_, absoluteFilePath != null ? absoluteFilePath.id : 0, outError);
+public NSString typeOfFile(NSString absoluteFilePath, long outError) {
+	long result = OS.objc_msgSend(this.id, OS.sel_typeOfFile_error_, absoluteFilePath != null ? absoluteFilePath.id : 0, outError);
 	return result != 0 ? new NSString(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
index 839feea199..3a4f2eec4a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
@@ -54,7 +54,7 @@ public class OS extends C {
 	 *  field-like text views created by the FieldAspect class. This is simply half of LargeNumberForText; at sizes as large as LargeNumberForText,
 	 *  the text system stops aligning text, for various reasons."
 	 */
-	public static final double /*float*/ MAX_TEXT_CONTAINER_SIZE = 0.5e7f;
+	public static final double MAX_TEXT_CONTAINER_SIZE = 0.5e7f;
 
 	public static final int gestaltSystemVersion = ('s'<<24) + ('y'<<16) + ('s'<<8) + 'v';
 	public static final int gestaltSystemVersionMajor = ('s'<<24) + ('y'<<16) + ('s'<<8) + '1';
@@ -89,100 +89,100 @@ public class OS extends C {
 	public static final int kPMDuplexNoTumble = 0x0002;
 	public static final int kPMDuplexTumble = 0x0003;
 
-	public static final long /*int*/ sel_identity = Selector.sel_identity.value;
-	public static final long /*int*/ sel_sendSearchSelection = Selector.sel_sendSearchSelection.value;
-	public static final long /*int*/ sel_sendCancelSelection = Selector.sel_sendCancelSelection.value;
-	public static final long /*int*/ sel_sendSelection = Selector.sel_sendSelection.value;
-	public static final long /*int*/ sel_sendSelection_ = Selector.sel_sendSelection_.value;
-	public static final long /*int*/ sel_sendDoubleSelection = Selector.sel_sendDoubleSelection.value;
-	public static final long /*int*/ sel_sendVerticalSelection = Selector.sel_sendVerticalSelection.value;
-	public static final long /*int*/ sel_sendHorizontalSelection = Selector.sel_sendHorizontalSelection.value;
-	public static final long /*int*/ sel_timerProc_ = Selector.sel_timerProc_.value;
-	public static final long /*int*/ sel_handleNotification_ = Selector.sel_handleNotification_.value;
-	public static final long /*int*/ sel_callJava = Selector.sel_callJava.value;
-	public static final long /*int*/ sel_callRunBeforeUnloadConfirmPanelWithMessage = Selector.sel_callRunBeforeUnloadConfirmPanelWithMessage.value;
-	public static final long /*int*/ sel_createPanelDidEnd = Selector.sel_createPanelDidEnd.value;
-	public static final long /*int*/ sel_systemColorSettingsChanged_ = Selector.sel_systemColorSettingsChanged_.value;
-	public static final long /*int*/ sel_screenParametersChanged_ = Selector.sel_screenParametersChanged_.value;
-	public static final long /*int*/ sel_panelDidEnd_returnCode_contextInfo_ = Selector.sel_panelDidEnd_returnCode_contextInfo_.value;
-	public static final long /*int*/ sel_updateOpenGLContext_ = Selector.sel_updateOpenGLContext_.value;
+	public static final long sel_identity = Selector.sel_identity.value;
+	public static final long sel_sendSearchSelection = Selector.sel_sendSearchSelection.value;
+	public static final long sel_sendCancelSelection = Selector.sel_sendCancelSelection.value;
+	public static final long sel_sendSelection = Selector.sel_sendSelection.value;
+	public static final long sel_sendSelection_ = Selector.sel_sendSelection_.value;
+	public static final long sel_sendDoubleSelection = Selector.sel_sendDoubleSelection.value;
+	public static final long sel_sendVerticalSelection = Selector.sel_sendVerticalSelection.value;
+	public static final long sel_sendHorizontalSelection = Selector.sel_sendHorizontalSelection.value;
+	public static final long sel_timerProc_ = Selector.sel_timerProc_.value;
+	public static final long sel_handleNotification_ = Selector.sel_handleNotification_.value;
+	public static final long sel_callJava = Selector.sel_callJava.value;
+	public static final long sel_callRunBeforeUnloadConfirmPanelWithMessage = Selector.sel_callRunBeforeUnloadConfirmPanelWithMessage.value;
+	public static final long sel_createPanelDidEnd = Selector.sel_createPanelDidEnd.value;
+	public static final long sel_systemColorSettingsChanged_ = Selector.sel_systemColorSettingsChanged_.value;
+	public static final long sel_screenParametersChanged_ = Selector.sel_screenParametersChanged_.value;
+	public static final long sel_panelDidEnd_returnCode_contextInfo_ = Selector.sel_panelDidEnd_returnCode_contextInfo_.value;
+	public static final long sel_updateOpenGLContext_ = Selector.sel_updateOpenGLContext_.value;
 
-	public static final long /*int*/ sel_overwriteExistingFileCheck = Selector.sel_overwriteExistingFileCheck.value;
-	public static final long /*int*/ sel_setShowsHiddenFiles_ = Selector.sel_setShowsHiddenFiles_.value;
+	public static final long sel_overwriteExistingFileCheck = Selector.sel_overwriteExistingFileCheck.value;
+	public static final long sel_setShowsHiddenFiles_ = Selector.sel_setShowsHiddenFiles_.value;
 
-	public static final long /*int*/ sel_contextID = Selector.sel_contextID.value;
+	public static final long sel_contextID = Selector.sel_contextID.value;
 
-	public static final long /*int*/ sel__drawThemeProgressArea_ = Selector.sel__drawThemeProgressArea_.value;
+	public static final long sel__drawThemeProgressArea_ = Selector.sel__drawThemeProgressArea_.value;
 
-	public static final long /*int*/ sel__setDashboardBehavior = Selector.sel__setDashboardBehavior.value;
+	public static final long sel__setDashboardBehavior = Selector.sel__setDashboardBehavior.value;
 
-	public static final long /*int*/ sel__setNeedsToUseHeartBeatWindow_ = Selector.sel__setNeedsToUseHeartBeatWindow_.value;
+	public static final long sel__setNeedsToUseHeartBeatWindow_ = Selector.sel__setNeedsToUseHeartBeatWindow_.value;
 
-	public static final long /*int*/ class_WebPanelAuthenticationHandler = OS.objc_getClass("WebPanelAuthenticationHandler");
-	public static final long /*int*/ sel_sharedHandler = Selector.sel_sharedHandler.value;
-	public static final long /*int*/ sel_startAuthentication = Selector.sel_startAuthentication.value;
-	public static final long /*int*/ sel_setAllowsAnyHTTPSCertificate = Selector.sel_setAllowsAnyHTTPSCertificate.value;
+	public static final long class_WebPanelAuthenticationHandler = OS.objc_getClass("WebPanelAuthenticationHandler");
+	public static final long sel_sharedHandler = Selector.sel_sharedHandler.value;
+	public static final long sel_startAuthentication = Selector.sel_startAuthentication.value;
+	public static final long sel_setAllowsAnyHTTPSCertificate = Selector.sel_setAllowsAnyHTTPSCertificate.value;
 
-	public static final long /*int*/ sel_accessibleHandle = Selector.sel_accessibleHandle.value;
-	public static final long /*int*/ sel_getImageView = Selector.sel_getImageView.value;
+	public static final long sel_accessibleHandle = Selector.sel_accessibleHandle.value;
+	public static final long sel_getImageView = Selector.sel_getImageView.value;
 
-	public static final long /*int*/ sel_clearDeferFlushing = Selector.sel_clearDeferFlushing.value;
+	public static final long sel_clearDeferFlushing = Selector.sel_clearDeferFlushing.value;
 
-	public static final long /*int*/ sel_setShouldExpandItem_ = Selector.sel_setShouldExpandItem_.value;
-	public static final long /*int*/ sel_setShouldScrollClipView_ = Selector.sel_setShouldScrollClipView_.value;
+	public static final long sel_setShouldExpandItem_ = Selector.sel_setShouldExpandItem_.value;
+	public static final long sel_setShouldScrollClipView_ = Selector.sel_setShouldScrollClipView_.value;
 
-	public static final long /*int*/ sel_setQuota = Selector.sel_setQuota.value;
-	public static final long /*int*/ sel_webView_frame_exceededDatabaseQuotaForSecurityOrigin_database_ = Selector.sel_webView_frame_exceededDatabaseQuotaForSecurityOrigin_database.value;
+	public static final long sel_setQuota = Selector.sel_setQuota.value;
+	public static final long sel_webView_frame_exceededDatabaseQuotaForSecurityOrigin_database_ = Selector.sel_webView_frame_exceededDatabaseQuotaForSecurityOrigin_database.value;
 
-	public static final long /*int*/ sel_beginSheetModalForWindow_completionHandler_ = Selector.sel_beginSheetModalForWindow_completionHandler_.value;
+	public static final long sel_beginSheetModalForWindow_completionHandler_ = Selector.sel_beginSheetModalForWindow_completionHandler_.value;
 
 	/** custom selector for SWT.OpenUrl event, also used in the launcher **/
-	public static final long /*int*/ sel_application_openUrls_ = Selector.sel_application_openUrls_.value;
+	public static final long sel_application_openUrls_ = Selector.sel_application_openUrls_.value;
 
 	/** non-API selector for NSCursor **/
-	public static final long /*int*/ sel_busyButClickableCursor = Selector.sel_busyButClickableCursor.value;
+	public static final long sel_busyButClickableCursor = Selector.sel_busyButClickableCursor.value;
 
 	/* These are not generated in order to avoid creating static methods on all classes */
-	public static final long /*int*/ sel_isSelectorExcludedFromWebScript_ = Selector.sel_isSelectorExcludedFromWebScript_.value;
-	public static final long /*int*/ sel_webScriptNameForSelector_ = Selector.sel_webScriptNameForSelector_.value;
+	public static final long sel_isSelectorExcludedFromWebScript_ = Selector.sel_isSelectorExcludedFromWebScript_.value;
+	public static final long sel_webScriptNameForSelector_ = Selector.sel_webScriptNameForSelector_.value;
 
-	public static final long /*int*/ sel_setColor_forAttribute_ = Selector.sel_setColor_forAttribute_.value;
+	public static final long sel_setColor_forAttribute_ = Selector.sel_setColor_forAttribute_.value;
 
-	public static final long /*int*/ sel_javaRunLoopMode = Selector.sel_javaRunLoopMode.value;
+	public static final long sel_javaRunLoopMode = Selector.sel_javaRunLoopMode.value;
 
 	/* These are not generated in order to avoid attempting to create a java method called "null" */
-	public static final long /*int*/ class_NSNull = objc_getClass("NSNull");
-	public static final long /*int*/ sel_null = Selector.sel_null.value;
+	public static final long class_NSNull = objc_getClass("NSNull");
+	public static final long sel_null = Selector.sel_null.value;
 
 	/* NSTextAttachmentCell */
 	/** @method callback_types=NSPoint;id;SEL;,callback_flags=struct;none;none; */
-	public static final native long /*int*/ CALLBACK_cellBaselineOffset(long /*int*/ func);
+	public static final native long CALLBACK_cellBaselineOffset(long func);
 	/** @method callback_types=NSSize;id;SEL;,callback_flags=struct;none;none; */
-	public static final native long /*int*/ CALLBACK_NSTextAttachmentCell_cellSize(long /*int*/ func);
+	public static final native long CALLBACK_NSTextAttachmentCell_cellSize(long func);
 	/** @method callback_types=id;id;SEL;,callback_flags=struct;none;none; */
-	public static final native long /*int*/ CALLBACK_NSTextAttachmentCell_attachment(long /*int*/ func);
-	public static final long /*int*/ sel_cellBaselineOffset = Selector.sel_cellBaselineOffset.value;
+	public static final native long CALLBACK_NSTextAttachmentCell_attachment(long func);
+	public static final long sel_cellBaselineOffset = Selector.sel_cellBaselineOffset.value;
 
 	/*10.6 Accessibility Strings*/
 	/** @method flags=const dynamic no_gen*/
-	public static final native long /*int*/ NSAccessibilityRowIndexRangeAttribute();
+	public static final native long NSAccessibilityRowIndexRangeAttribute();
 	public static final NSString NSAccessibilityRowIndexRangeAttribute = new NSString(NSAccessibilityRowIndexRangeAttribute());
 	/** @method flags=const dynamic no_gen*/
-	public static final native long /*int*/ NSAccessibilityColumnIndexRangeAttribute();
+	public static final native long NSAccessibilityColumnIndexRangeAttribute();
 	public static final NSString NSAccessibilityColumnIndexRangeAttribute = new NSString(NSAccessibilityColumnIndexRangeAttribute());
 	/** @method flags=const dynamic no_gen*/
-	public static final native long /*int*/ NSAccessibilityCellForColumnAndRowParameterizedAttribute();
+	public static final native long NSAccessibilityCellForColumnAndRowParameterizedAttribute();
 	public static final NSString NSAccessibilityCellForColumnAndRowParameterizedAttribute = new NSString(NSAccessibilityCellForColumnAndRowParameterizedAttribute());
 	/** @method flags=const dynamic no_gen*/
-	public static final native long /*int*/ NSAccessibilityCellRole();
+	public static final native long NSAccessibilityCellRole();
 	public static final NSString NSAccessibilityCellRole = new NSString(NSAccessibilityCellRole());
 
 	/** 10.7 selectors and constants */
-	public static final long /*int*/ sel_isCompatibleWithOverlayScrollers = Selector.sel_isCompatibleWithOverlayScrollers.value;
-	public static final long /*int*/ sel_flashScrollers = Selector.sel_flashScrollers.value;
-	public static final long /*int*/ sel_frameSizeForContentSize_horizontalScrollerClass_verticalScrollerClass_borderType_controlSize_scrollerStyle_ = Selector.sel_frameSizeForContentSize_horizontalScrollerClass_verticalScrollerClass_borderType_controlSize_scrollerStyle_.value;
-	public static final long /*int*/ sel_scrollerStyle = Selector.sel_scrollerStyle.value;
-	public static final long /*int*/ sel_toggleFullScreen_ = Selector.sel_toggleFullScreen_.value;
+	public static final long sel_isCompatibleWithOverlayScrollers = Selector.sel_isCompatibleWithOverlayScrollers.value;
+	public static final long sel_flashScrollers = Selector.sel_flashScrollers.value;
+	public static final long sel_frameSizeForContentSize_horizontalScrollerClass_verticalScrollerClass_borderType_controlSize_scrollerStyle_ = Selector.sel_frameSizeForContentSize_horizontalScrollerClass_verticalScrollerClass_borderType_controlSize_scrollerStyle_.value;
+	public static final long sel_scrollerStyle = Selector.sel_scrollerStyle.value;
+	public static final long sel_toggleFullScreen_ = Selector.sel_toggleFullScreen_.value;
 
 	public static final int NSScrollerStyleLegacy = 0;
 	public static final int NSScrollerStyleOverlay = 1;
@@ -192,13 +192,13 @@ public class OS extends C {
 	public static final int NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8;
 
 	/** 10.12 selector */
-	public static final long /*int*/ sel_setAllowsAutomaticWindowTabbing_ = Selector.sel_setAllowsAutomaticWindowTabbing.value;
+	public static final long sel_setAllowsAutomaticWindowTabbing_ = Selector.sel_setAllowsAutomaticWindowTabbing.value;
 
 	/* AWT application delegate. Remove these when JavaRuntimeSupport.framework has bridgesupport generated for it. */
-	public static final long /*int*/ class_JRSAppKitAWT = objc_getClass("JRSAppKitAWT");
-	public static final long /*int*/ sel_awtAppDelegate = Selector.sel_awtAppDelegate.value;
+	public static final long class_JRSAppKitAWT = objc_getClass("JRSAppKitAWT");
+	public static final long sel_awtAppDelegate = Selector.sel_awtAppDelegate.value;
 
-	public static final long /*int*/ class_NSToolbarView = objc_getClass("NSToolbarView");
+	public static final long class_NSToolbarView = objc_getClass("NSToolbarView");
 
 	/*
 	 * Wrapper function which will call NSSavePanel.beginSheetModalForWindow. This
@@ -216,7 +216,7 @@ public class OS extends C {
 	/*
 	 * Custom message that will be sent when setTheme is called for example from Platform UI code.
 	 */
-	public static final long /*int*/ sel_appAppearanceChanged = OS.sel_registerName("appAppearanceChanged");
+	public static final long sel_appAppearanceChanged = OS.sel_registerName("appAppearanceChanged");
 	public static void setTheme(boolean isDarkTheme) {
 		OS.objc_msgSend(NSApplication.sharedApplication().id, sel_appAppearanceChanged, isDarkTheme ? 1 : 0);
 	}
@@ -240,14 +240,14 @@ public class OS extends C {
 /** JNI natives */
 
 /** @method flags=jni */
-public static final native long /*int*/ NewGlobalRef(Object object);
+public static final native long NewGlobalRef(Object object);
 /**
  * @method flags=jni
  * @param globalRef cast=(jobject)
  */
-public static final native void DeleteGlobalRef(long /*int*/ globalRef);
+public static final native void DeleteGlobalRef(long globalRef);
 /** @method flags=no_gen */
-public static final native Object JNIGetObject(long /*int*/ globalRef);
+public static final native Object JNIGetObject(long globalRef);
 
 /** Carbon calls */
 
@@ -256,7 +256,7 @@ public static final native int Gestalt(int selector, int[] response);
 public static final native int GetCurrentProcess(int[] psn);
 /** @param psn cast=(ProcessSerialNumber *) */
 public static final native int TransformProcessType(int[] psn, int transformState);
-public static final native int CPSSetProcessName(int[] psn, long /*int*/ name);
+public static final native int CPSSetProcessName(int[] psn, long name);
 /** @method flags=dynamic */
 public static final native int SetThemeCursor(int themeCursor);
 /** @method flags=dynamic */
@@ -270,18 +270,18 @@ public static final native int GetDblTime();
 	@param inMIMEType cast=(CFStringRef)
 	@param inUsageFlags cast=(IconServicesUsageFlags)
 	@param outIconRef cast=(IconRef *) */
-public static final native int GetIconRefFromTypeInfo(int inCreator, int inType, long /*int*/ inExtension, long /*int*/ inMIMEType, int inUsageFlags, long /*int*/ outIconRef[]);
+public static final native int GetIconRefFromTypeInfo(int inCreator, int inType, long inExtension, long inMIMEType, int inUsageFlags, long outIconRef[]);
 /** @method flags=dynamic
     @param context cast=(CGContextRef) */
-public static final native long /*int*/ CGContextCopyPath(long /*int*/ context);
+public static final native long CGContextCopyPath(long context);
 /** @method flags=dynamic */
-public static final native long /*int*/ TISCopyCurrentKeyboardInputSource();
+public static final native long TISCopyCurrentKeyboardInputSource();
 /** @method flags=dynamic
     @param inputSource cast=(TISInputSourceRef)
     @param propertyKey cast=(CFStringRef) */
-public static final native long /*int*/ TISGetInputSourceProperty (long /*int*/ inputSource, long /*int*/ propertyKey);
+public static final native long TISGetInputSourceProperty (long inputSource, long propertyKey);
 /** @method flags=no_gen */
-public static final native long /*int*/ kTISPropertyUnicodeKeyLayoutData();
+public static final native long kTISPropertyUnicodeKeyLayoutData();
 /**
  * @method flags=dynamic
  * @param inMode cast=(UInt32)
@@ -307,12 +307,12 @@ public static final native int GetSystemUIMode(int[] outMode, int[] outOptions);
  * @param actualStringLength cast=(UniCharCount *)
  * @param unicodeString cast=(UniChar *)
  */
-public static final native int UCKeyTranslate (long /*int*/ keyLayoutPtr, short virtualKeyCode, short keyAction, int modifierKeyState, int keyboardType, int keyTranslateOptions, int[] deadKeyState, int maxStringLength, int[] actualStringLength, char[] unicodeString);
+public static final native int UCKeyTranslate (long keyLayoutPtr, short virtualKeyCode, short keyAction, int modifierKeyState, int keyboardType, int keyTranslateOptions, int[] deadKeyState, int maxStringLength, int[] actualStringLength, char[] unicodeString);
 /**
  * @param inUTI1 cast=(CFStringRef)
  * @param inUTI2 cast=(CFStringRef)
  */
-public static final native boolean UTTypeEqual(long /*int*/ inUTI1, long /*int*/ inUTI2);
+public static final native boolean UTTypeEqual(long inUTI1, long inUTI2);
 
 /**
  * @method flags=dynamic
@@ -323,7 +323,7 @@ public static final native void GetThemeMetric(int themeConstant, int[] metric);
  * @method flags=dynamic
  * @param inContext cast=(CGContextRef)
 */
-public static final native int HIThemeDrawFocusRect(CGRect inRect, boolean inHasFocus, long /*int*/ inContext, int inOrientation);
+public static final native int HIThemeDrawFocusRect(CGRect inRect, boolean inHasFocus, long inContext, int inOrientation);
 
 public static final int kUCKeyActionDown = 0;
 public static final int kUCKeyActionUp = 1;
@@ -340,7 +340,7 @@ public static final int kThemeAliasArrowCursor = 2;
  * @param iOptions cast=(ATSOptionFlags)
  * @param oContainer cast=(ATSFontContainerRef *)
  */
-public static final native int ATSFontActivateFromFileReference(byte[] iFile, int iContext, int iFormat, long /*int*/ iReserved, int iOptions, long /*int*/ [] oContainer);
+public static final native int ATSFontActivateFromFileReference(byte[] iFile, int iContext, int iFormat, long iReserved, int iOptions, long [] oContainer);
 
 public static final int kATSFontContextLocal = 2;
 public static final int kATSOptionFlagsDefault = 0;
@@ -351,15 +351,15 @@ public static final int kATSFontFormatUnspecified = 0;
  * @param ref cast=(FSRef *)
  * @param isDirectory cast=(Boolean *)
  */
-public static final native int FSPathMakeRef (long /*int*/ path, byte[] ref, boolean[] isDirectory);
+public static final native int FSPathMakeRef (long path, byte[] ref, boolean[] isDirectory);
 
 /** @method flags=dynamic */
 public static final native byte LMGetKbdType();
 
 /** @method flags=dynamic */
-public static final native long /*int*/ AcquireRootMenu ();
+public static final native long AcquireRootMenu ();
 /** @method flags=dynamic */
-public static final native int CancelMenuTracking (long /*int*/ inRootMenu, boolean inImmediate, int inDismissalReason);
+public static final native int CancelMenuTracking (long inRootMenu, boolean inImmediate, int inDismissalReason);
 /**
  * @param inType cast=(OSType)
  * @param inCreator cast=(OSType)
@@ -368,7 +368,7 @@ public static final native int CancelMenuTracking (long /*int*/ inRootMenu, bool
  * @param outAppRef cast=(FSRef *)
  * @param outAppURL cast=(CFURLRef *)
  */
-public static final native long /*int*/ LSGetApplicationForInfo(int inType, int inCreator,long /*int*/ inExtension, int inRoleMask, byte[] outAppRef, int[] outAppURL);
+public static final native long LSGetApplicationForInfo(int inType, int inCreator,long inExtension, int inRoleMask, byte[] outAppRef, int[] outAppURL);
 /** @method flags=dynamic
  * @param mHandle cast=(MenuRef)
  * @param commandId cast=(MenuCommand)
@@ -376,83 +376,83 @@ public static final native long /*int*/ LSGetApplicationForInfo(int inType, int
  * @param outMenu cast=(MenuRef *)
  * @param outIndex cast=(MenuItemIndex *)
  */
-public static final native int GetIndMenuItemWithCommandID(long /*int*/ mHandle, int commandId, int index, long /*int*/ [] outMenu, short[] outIndex);
+public static final native int GetIndMenuItemWithCommandID(long mHandle, int commandId, int index, long [] outMenu, short[] outIndex);
 /** @method flags=dynamic
  * @param mHandle cast=(MenuRef)
  * @param index cast=(short)
  */
-public static final native void DeleteMenuItem(long /*int*/ mHandle, short index);
+public static final native void DeleteMenuItem(long mHandle, short index);
 /** @method flags=dynamic
  * @param pmSessionInfo cast=(PMPrintSession)
  * @param outPMPrinter cast=(PMPrinter *)
  */
-public static final native long /*int*/ PMSessionGetCurrentPrinter(long /*int*/ pmSessionInfo, long /*int*/[] outPMPrinter);
+public static final native long PMSessionGetCurrentPrinter(long pmSessionInfo, long[] outPMPrinter);
 /** @method flags=dynamic
  * @param pmSessionInfo cast=(PMPrintSession)
  * @param pmPrintSettings cast=(PMPrintSettings)
  */
-public static final native long /*int*/ PMSessionGetDestinationType(long /*int*/ pmSessionInfo, long /*int*/ pmPrintSettings, short[] outDestinationType);
+public static final native long PMSessionGetDestinationType(long pmSessionInfo, long pmPrintSettings, short[] outDestinationType);
 /** @method flags=dynamic
  * @param printSettings cast=(PMPrintSettings)
  * @param outDuplexSetting cast=(PMDuplexMode *)
  */
-public static final native long /*int*/ PMGetDuplex(long /*int*/ printSettings, int[] outDuplexSetting);
+public static final native long PMGetDuplex(long printSettings, int[] outDuplexSetting);
 /** @method flags=dynamic
  * @param printSettings cast=(PMPrintSettings)
  * @param duplexSetting cast=(PMDuplexMode)
  */
-public static final native long /*int*/ PMSetDuplex(long /*int*/ printSettings, int duplexSetting);
+public static final native long PMSetDuplex(long printSettings, int duplexSetting);
 /** @method flags=dynamic
  * @param pmPrinter cast=(PMPrinter)
  * @param outNumResolutions cast=(UInt32 *)
  */
-public static final native long /*int*/ PMPrinterGetPrinterResolutionCount(long /*int*/ pmPrinter, int[] outNumResolutions);
+public static final native long PMPrinterGetPrinterResolutionCount(long pmPrinter, int[] outNumResolutions);
 /** @method flags=dynamic
  * @param pmPrinter cast=(PMPrinter)
  * @param pmPrintSettings cast=(PMPrintSettings)
  * @param outResolution cast=(PMResolution *)
  */
-public static final native long /*int*/ PMPrinterGetOutputResolution(long /*int*/ pmPrinter, long /*int*/ pmPrintSettings, PMResolution outResolution);
+public static final native long PMPrinterGetOutputResolution(long pmPrinter, long pmPrintSettings, PMResolution outResolution);
 /** @method flags=dynamic
  * @param pmPrinter cast=(PMPrinter)
  * @param outResolution cast=(PMResolution *)
  */
-public static final native long /*int*/ PMPrinterGetIndexedPrinterResolution(long /*int*/ pmPrinter, int index, PMResolution outResolution);
+public static final native long PMPrinterGetIndexedPrinterResolution(long pmPrinter, int index, PMResolution outResolution);
 
 // Custom FindWindow implementation to avoid namespace collisions with Point.
 /**
  * @method flags=no_gen
  * @param wHandle cast=(WindowRef *)
  */
-public static final native long /*int*/ FindWindow (long /*int*/ h, long /*int*/ v, long /*int*/ [] wHandle);
+public static final native long FindWindow (long h, long v, long [] wHandle);
 
 /**
  * @method flags=dynamic
  * @param display cast=(CGDirectDisplayID)
  */
-public static final native long /*int*/ CGDisplayBaseAddress(int display);
+public static final native long CGDisplayBaseAddress(int display);
 /**
  * @method flags=dynamic
  * @param display cast=(CGDirectDisplayID)
  */
-public static final native long /*int*/ CGDisplayBitsPerPixel(int display);
+public static final native long CGDisplayBitsPerPixel(int display);
 /**
  * @method flags=dynamic
  * @param display cast=(CGDirectDisplayID)
  */
-public static final native long /*int*/ CGDisplayBitsPerSample(int display);
+public static final native long CGDisplayBitsPerSample(int display);
 /**
  * @method flags=dynamic
  * @param display cast=(CGDirectDisplayID)
  */
-public static final native long /*int*/ CGDisplayBytesPerRow(int display);
+public static final native long CGDisplayBytesPerRow(int display);
 
 
 /** C calls */
 
 public static final native int getpid();
 
-public static final native void call(long /*int*/ proc, long /*int*/ id, long /*int*/ sel);
+public static final native void call(long proc, long id, long sel);
 
 /** @method flags=no_gen */
 public static final native boolean __BIG_ENDIAN__();
@@ -469,53 +469,53 @@ public static final int kCGBitmapByteOrder32Host = __BIG_ENDIAN__() ? kCGBitmapB
  * @param destRect flags=struct
  * @param srcRect flags=struct
  */
-public static final native void CGContextCopyWindowContentsToRect(long /*int*/ context, CGRect destRect, long /*int*/ contextID, long /*int*/ windowNumber, CGRect srcRect);
+public static final native void CGContextCopyWindowContentsToRect(long context, CGRect destRect, long contextID, long windowNumber, CGRect srcRect);
 
 /**
  * @method flags=dynamic
  * @param displayID cast=(CGDirectDisplayID)
  */
-public static final native long /*int*/ CGDisplayCreateImage(int displayID);
+public static final native long CGDisplayCreateImage(int displayID);
 
 /** QuickDraw calls */
 
 /** @method flags=dynamic */
-public static final native long /*int*/ NewRgn();
+public static final native long NewRgn();
 /** @method flags=dynamic */
-public static final native void RectRgn(long /*int*/ rgnHandle, short[] rect);
+public static final native void RectRgn(long rgnHandle, short[] rect);
 /** @method flags=dynamic */
 public static final native void OpenRgn();
 /** @method flags=dynamic */
-public static final native void OffsetRgn(long /*int*/ rgnHandle, short dh, short dv);
+public static final native void OffsetRgn(long rgnHandle, short dh, short dv);
 /** @method flags=dynamic */
 public static final native void MoveTo(short h, short v);
 /** @method flags=dynamic */
 public static final native void LineTo(short h, short v);
 /** @method flags=dynamic */
-public static final native void UnionRgn(long /*int*/ srcRgnA, long /*int*/ srcRgnB, long /*int*/ dstRgn);
+public static final native void UnionRgn(long srcRgnA, long srcRgnB, long dstRgn);
 /** @method flags=dynamic */
-public static final native void CloseRgn(long /*int*/ dstRgn);
+public static final native void CloseRgn(long dstRgn);
 /** @method flags=dynamic */
-public static final native void DisposeRgn(long /*int*/ rgnHandle);
+public static final native void DisposeRgn(long rgnHandle);
 /**
  * @method flags=dynamic
  * @param pt flags=struct,cast=(Point *)
  */
-public static final native boolean PtInRgn(short[] pt, long /*int*/ rgnHandle);
+public static final native boolean PtInRgn(short[] pt, long rgnHandle);
 /** @method flags=dynamic */
-public static final native void GetRegionBounds(long /*int*/ rgnHandle, short[] bounds);
+public static final native void GetRegionBounds(long rgnHandle, short[] bounds);
 /** @method flags=dynamic */
-public static final native void SectRgn(long /*int*/ srcRgnA, long /*int*/ srcRgnB, long /*int*/ dstRgn);
+public static final native void SectRgn(long srcRgnA, long srcRgnB, long dstRgn);
 /** @method flags=dynamic */
-public static final native boolean EmptyRgn(long /*int*/ rgnHandle);
+public static final native boolean EmptyRgn(long rgnHandle);
 /** @method flags=dynamic */
-public static final native void DiffRgn(long /*int*/ srcRgnA, long /*int*/ srcRgnB, long /*int*/ dstRgn);
+public static final native void DiffRgn(long srcRgnA, long srcRgnB, long dstRgn);
 /** @method flags=dynamic */
-public static final native boolean RectInRgn(short[] rect, long /*int*/ rgnHandle);
+public static final native boolean RectInRgn(short[] rect, long rgnHandle);
 /** @method flags=dynamic */
-public static final native int QDRegionToRects(long /*int*/ rgn, int dir, long /*int*/ proc, long /*int*/ userData);
+public static final native int QDRegionToRects(long rgn, int dir, long proc, long userData);
 /** @method flags=dynamic */
-public static final native void CopyRgn(long /*int*/ srcRgnHandle, long /*int*/ dstRgnHandle);
+public static final native void CopyRgn(long srcRgnHandle, long dstRgnHandle);
 /** @method flags=dynamic */
 public static final native void SetRect(short[] r, short left, short top, short right, short bottom);
 public static final int kQDParseRegionFromTop = (1 << 0);
@@ -529,7 +529,7 @@ public static final int kQDRegionToRectsMsgParse = 2;
  * @method flags=dynamic
  * @param inWindow cast=(WindowRef)
  */
-public static final native int HIWindowGetCGWindowID(long /*int*/ inWindow);
+public static final native int HIWindowGetCGWindowID(long inWindow);
 
 /** JavaScriptCore calls */
 
@@ -540,17 +540,17 @@ public static final native int HIWindowGetCGWindowID(long /*int*/ inWindow);
  * @param sourceURL cast=(JSStringRef)
  * @param exception cast=(JSValueRef *)
  */
-public static final native long /*int*/ JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception);
+public static final native long JSEvaluateScript (long ctx, long script, long thisObject, long sourceURL, int startingLineNumber, long[] exception);
 
 /**
  * @param string cast=(const char *)
  */
-public static final native long /*int*/ JSStringCreateWithUTF8CString (byte[] string);
+public static final native long JSStringCreateWithUTF8CString (byte[] string);
 
 /**
  * @param string cast=(JSStringRef)
  */
-public static final native void JSStringRelease (long /*int*/ string);
+public static final native void JSStringRelease (long string);
 
 
 /** Certificate Security */
@@ -561,20 +561,20 @@ public static final native void JSStringRelease (long /*int*/ string);
  * @param value cast=(CSSM_DATA *)
  * @param policySearch cast=(SecPolicySearchRef *)
  */
-public static final native int SecPolicySearchCreate(long /*int*/ certType, long /*int*/ policyOID, long /*int*/ value, long /*int*/ [] policySearch);
+public static final native int SecPolicySearchCreate(long certType, long policyOID, long value, long [] policySearch);
 
 /**
  * @param searchRef cast=(SecPolicySearchRef)
  * @param policyRef cast=(SecPolicyRef *)
  */
-public static final native int SecPolicySearchCopyNext(long /*int*/ searchRef, long /*int*/ [] policyRef);
+public static final native int SecPolicySearchCopyNext(long searchRef, long [] policyRef);
 
 /**
  * @param certificates cast=(CFArrayRef)
  * @param policies cast=(CFTypeRef)
  * @param trustRef cast=(SecTrustRef *)
  */
-public static final native int SecTrustCreateWithCertificates(long /*int*/ certificates, long /*int*/ policies, long /*int*/ [] trustRef);
+public static final native int SecTrustCreateWithCertificates(long certificates, long policies, long [] trustRef);
 
 public static final int CSSM_CERT_X_509v3 = 0x3;
 
@@ -582,7 +582,7 @@ public static final int CSSM_CERT_X_509v3 = 0x3;
 /** Custom callbacks */
 
 /** @method flags=no_gen */
-public static final native long /*int*/ isFlipped_CALLBACK();
+public static final native long isFlipped_CALLBACK();
 
 /** Custom structure return */
 
@@ -595,15 +595,15 @@ public static final native void NSIntersectionRect (NSRect result, NSRect aRect,
 public static final native void CGDisplayBounds(int display, CGRect rect);
 
 /** @method flags=const address*/
-public static final native long /*int*/ kCFTypeDictionaryKeyCallBacks();
+public static final native long kCFTypeDictionaryKeyCallBacks();
 /** @method flags=const address*/
-public static final native long /*int*/ kCFTypeDictionaryValueCallBacks();
+public static final native long kCFTypeDictionaryValueCallBacks();
 
 /** @method flags=const */
-public static final native long /*int*/ kUTTypeFileURL();
+public static final native long kUTTypeFileURL();
 public static final NSString kUTTypeFileURL = new NSString(kUTTypeFileURL());
 /** @method flags=const */
-public static final native long /*int*/ kUTTypeURL();
+public static final native long kUTTypeURL();
 public static final NSString kUTTypeURL = new NSString(kUTTypeURL());
 
 /** Objective-C runtime */
@@ -613,376 +613,376 @@ public static final NSString kUTTypeURL = new NSString(kUTTypeURL());
  * @param name cast=(const char *),flags=critical
  * @param types cast=(const char *),flags=critical
  */
-public static final native boolean class_addIvar(long /*int*/ cls, byte[] name, long /*int*/ size, byte alignment, byte[] types);
+public static final native boolean class_addIvar(long cls, byte[] name, long size, byte alignment, byte[] types);
 /**
  * @param cls cast=(Class)
  * @param name cast=(SEL)
  * @param imp cast=(IMP)
  */
-public static final native boolean class_addMethod(long /*int*/ cls, long /*int*/ name, long /*int*/ imp, String types);
+public static final native boolean class_addMethod(long cls, long name, long imp, String types);
 /**
  * @param cls cast=(Class)
  * @param protocol cast=(Protocol *)
  */
-public static final native boolean class_addProtocol(long /*int*/ cls, long /*int*/ protocol);
+public static final native boolean class_addProtocol(long cls, long protocol);
 /**
  * @param aClass cast=(Class)
  * @param aSelector cast=(SEL)
  */
-public static final native long /*int*/ class_getClassMethod(long /*int*/ aClass, long /*int*/ aSelector);
+public static final native long class_getClassMethod(long aClass, long aSelector);
 /**
  * @param cls cast=(Class)
  * @param name cast=(SEL)
  */
-public static final native long /*int*/ class_getMethodImplementation(long /*int*/ cls, long /*int*/ name);
+public static final native long class_getMethodImplementation(long cls, long name);
 /**
  * @param cls cast=(Class)
  * @param name cast=(SEL)
  */
-public static final native long /*int*/ class_getInstanceMethod(long /*int*/ cls, long /*int*/ name);
+public static final native long class_getInstanceMethod(long cls, long name);
 /** @param cls cast=(Class) */
-public static final native long /*int*/ class_getSuperclass(long /*int*/ cls);
+public static final native long class_getSuperclass(long cls);
 /**
  * @param method cast=(Method)
  * @param imp cast=(IMP)
  */
-public static final native long /*int*/ method_setImplementation(long /*int*/ method, long /*int*/ imp);
+public static final native long method_setImplementation(long method, long imp);
 /**
  * @param sel cast=(SEL)
  */
-public static final native long /*int*/ sel_getName(long /*int*/ sel);
+public static final native long sel_getName(long sel);
 /**
  * @param cls cast=(Class)
  * @param extraBytes cast=(size_t)
  */
-public static final native long /*int*/ class_createInstance(long /*int*/ cls, long /*int*/ extraBytes);
+public static final native long class_createInstance(long cls, long extraBytes);
 
 /** @method flags=no_gen */
-public static final native String class_getName(long /*int*/ cls);
+public static final native String class_getName(long cls);
 /** @method flags=dynamic */
 public static final native void instrumentObjcMessageSends(boolean val);
 /** @param superclass cast=(Class) */
-public static final native long /*int*/ objc_allocateClassPair(long /*int*/ superclass, String name, long /*int*/ extraBytes);
+public static final native long objc_allocateClassPair(long superclass, String name, long extraBytes);
 /** @param klass cast=(Class) */
-public static final native void objc_disposeClassPair(long /*int*/ klass);
-public static final native long /*int*/ objc_getClass(String className);
-public static final native long /*int*/ objc_getMetaClass(String name);
-public static final native long /*int*/ objc_getProtocol(String name);
-public static final native long /*int*/ objc_lookUpClass(String className);
+public static final native void objc_disposeClassPair(long klass);
+public static final native long objc_getClass(String className);
+public static final native long objc_getMetaClass(String name);
+public static final native long objc_getProtocol(String name);
+public static final native long objc_lookUpClass(String className);
 /** @param cls cast=(Class) */
-public static final native void objc_registerClassPair(long /*int*/ cls);
+public static final native void objc_registerClassPair(long cls);
 /** @param obj cast=(id) */
-public static final native long /*int*/ object_getClassName(long /*int*/ obj);
+public static final native long object_getClassName(long obj);
 /** @param obj cast=(id) */
-public static final native long /*int*/ object_getClass(long /*int*/ obj);
+public static final native long object_getClass(long obj);
 
 /**
  * @param obj cast=(id)
  * @param name cast=(const char*),flags=critical
  * @param outValue cast=(void **),flags=critical
  */
-public static final native long /*int*/ object_getInstanceVariable(long /*int*/ obj, byte[] name, long /*int*/ [] outValue);
+public static final native long object_getInstanceVariable(long obj, byte[] name, long [] outValue);
 /**
  * @param obj cast=(id)
  * @param name cast=(const char*),flags=critical
  * @param value cast=(void *),flags=critical
  */
-public static final native long /*int*/ object_setInstanceVariable(long /*int*/ obj, byte[] name, long /*int*/ value);
+public static final native long object_setInstanceVariable(long obj, byte[] name, long value);
 /**
  * @param obj cast=(id)
  * @param clazz cast=(Class)
  */
-public static final native long /*int*/ object_setClass(long /*int*/ obj, long /*int*/ clazz);
-public static final native long /*int*/ sel_registerName(String selectorName);
+public static final native long object_setClass(long obj, long clazz);
+public static final native long sel_registerName(String selectorName);
 public static final native int objc_super_sizeof();
 
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel, NSSize arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5);
+public static final native void objc_msgSend_stret(NSSize result, long id, long sel, NSSize arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
 
 /** This section is auto generated */
 
 /** Custom callbacks */
 /** @method callback_types=id;id;SEL;NSPoint;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_accessibilityHitTest_(long /*int*/ func);
+public static final native long CALLBACK_accessibilityHitTest_(long func);
 /** @method callback_types=NSAttributedString*;id;SEL;NSRange;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_attributedSubstringFromRange_(long /*int*/ func);
+public static final native long CALLBACK_attributedSubstringFromRange_(long func);
 /** @method callback_types=void;id;SEL;NSRect;NSBitmapImageRep*;,callback_flags=none;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_cacheDisplayInRect_toBitmapImageRep_(long /*int*/ func);
+public static final native long CALLBACK_cacheDisplayInRect_toBitmapImageRep_(long func);
 /** @method callback_types=BOOL;id;SEL;NSIndexSet*;NSPoint;,callback_flags=none;none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_canDragRowsWithIndexes_atPoint_(long /*int*/ func);
+public static final native long CALLBACK_canDragRowsWithIndexes_atPoint_(long func);
 /** @method callback_types=NSSize;id;SEL;,callback_flags=struct;none;none; */
-public static final native long /*int*/ CALLBACK_cellSize(long /*int*/ func);
+public static final native long CALLBACK_cellSize(long func);
 /** @method callback_types=NSSize;id;SEL;NSRect;,callback_flags=struct;none;none;struct; */
-public static final native long /*int*/ CALLBACK_cellSizeForBounds_(long /*int*/ func);
+public static final native long CALLBACK_cellSizeForBounds_(long func);
 /** @method callback_types=NSUInteger;id;SEL;NSPoint;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_characterIndexForPoint_(long /*int*/ func);
+public static final native long CALLBACK_characterIndexForPoint_(long func);
 /** @method callback_types=NSInteger;id;SEL;NSPoint;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_columnAtPoint_(long /*int*/ func);
+public static final native long CALLBACK_columnAtPoint_(long func);
 /** @method callback_types=BOOL;id;SEL;NSEvent*;NSSize;BOOL;,callback_flags=none;none;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_dragSelectionWithEvent_offset_slideBack_(long /*int*/ func);
+public static final native long CALLBACK_dragSelectionWithEvent_offset_slideBack_(long func);
 /** @method callback_types=void;id;SEL;NSImage*;NSPoint;,callback_flags=none;none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_draggedImage_beganAt_(long /*int*/ func);
+public static final native long CALLBACK_draggedImage_beganAt_(long func);
 /** @method callback_types=void;id;SEL;NSImage*;NSPoint;NSDragOperation;,callback_flags=none;none;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_draggedImage_endedAt_operation_(long /*int*/ func);
+public static final native long CALLBACK_draggedImage_endedAt_operation_(long func);
 /** @method callback_types=void;id;SEL;NSRect;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_drawBackgroundInClipRect_(long /*int*/ func);
+public static final native long CALLBACK_drawBackgroundInClipRect_(long func);
 /** @method callback_types=void;id;SEL;NSRect;NSView*;,callback_flags=none;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_drawBezelWithFrame_inView_(long /*int*/ func);
+public static final native long CALLBACK_drawBezelWithFrame_inView_(long func);
 /** @method callback_types=void;id;SEL;NSImage*;NSRect;NSView*;,callback_flags=none;none;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_drawImage_withFrame_inView_(long /*int*/ func);
+public static final native long CALLBACK_drawImage_withFrame_inView_(long func);
 /** @method callback_types=void;id;SEL;NSRect;NSView*;,callback_flags=none;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_drawInteriorWithFrame_inView_(long /*int*/ func);
+public static final native long CALLBACK_drawInteriorWithFrame_inView_(long func);
 /** @method callback_types=void;id;SEL;BOOL;NSRect;,callback_flags=none;none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_drawLabel_inRect_(long /*int*/ func);
+public static final native long CALLBACK_drawLabel_inRect_(long func);
 /** @method callback_types=void;id;SEL;NSRect;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_drawRect_(long /*int*/ func);
+public static final native long CALLBACK_drawRect_(long func);
 /** @method callback_types=NSRect;id;SEL;NSAttributedString*;NSRect;NSView*;,callback_flags=struct;none;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_drawTitle_withFrame_inView_(long /*int*/ func);
+public static final native long CALLBACK_drawTitle_withFrame_inView_(long func);
 /** @method callback_types=void;id;SEL;NSRect;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_drawViewBackgroundInRect_(long /*int*/ func);
+public static final native long CALLBACK_drawViewBackgroundInRect_(long func);
 /** @method callback_types=void;id;SEL;NSRect;NSView*;,callback_flags=none;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_drawWithExpansionFrame_inView_(long /*int*/ func);
+public static final native long CALLBACK_drawWithExpansionFrame_inView_(long func);
 /** @method callback_types=NSRect;id;SEL;NSRect;NSView*;,callback_flags=struct;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_expansionFrameWithFrame_inView_(long /*int*/ func);
+public static final native long CALLBACK_expansionFrameWithFrame_inView_(long func);
 /** @method callback_types=NSRect;id;SEL;NSRange;,callback_flags=struct;none;none;struct; */
-public static final native long /*int*/ CALLBACK_firstRectForCharacterRange_(long /*int*/ func);
+public static final native long CALLBACK_firstRectForCharacterRange_(long func);
 /** @method callback_types=NSRect;id;SEL;NSRect;NSView*;,callback_flags=struct;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_focusRingMaskBoundsForFrame_inView_(long /*int*/ func);
+public static final native long CALLBACK_focusRingMaskBoundsForFrame_inView_(long func);
 /** @method callback_types=NSRect;id;SEL;NSInteger;,callback_flags=struct;none;none;none; */
-public static final native long /*int*/ CALLBACK_headerRectOfColumn_(long /*int*/ func);
+public static final native long CALLBACK_headerRectOfColumn_(long func);
 /** @method callback_types=void;id;SEL;NSRect;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_highlightSelectionInClipRect_(long /*int*/ func);
+public static final native long CALLBACK_highlightSelectionInClipRect_(long func);
 /** @method callback_types=NSView*;id;SEL;NSPoint;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_hitTest_(long /*int*/ func);
+public static final native long CALLBACK_hitTest_(long func);
 /** @method callback_types=NSCellHitResult;id;SEL;NSEvent*;NSRect;NSView*;,callback_flags=none;none;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_hitTestForEvent_inRect_ofView_(long /*int*/ func);
+public static final native long CALLBACK_hitTestForEvent_inRect_ofView_(long func);
 /** @method callback_types=NSRect;id;SEL;NSRect;,callback_flags=struct;none;none;struct; */
-public static final native long /*int*/ CALLBACK_imageRectForBounds_(long /*int*/ func);
+public static final native long CALLBACK_imageRectForBounds_(long func);
 /** @method callback_types=NSRange;id;SEL;,callback_flags=struct;none;none; */
-public static final native long /*int*/ CALLBACK_markedRange(long /*int*/ func);
+public static final native long CALLBACK_markedRange(long func);
 /** @method callback_types=void;id;SEL;NSClipView*;NSPoint;,callback_flags=none;none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_scrollClipView_toPoint_(long /*int*/ func);
+public static final native long CALLBACK_scrollClipView_toPoint_(long func);
 /** @method callback_types=NSRange;id;SEL;,callback_flags=struct;none;none; */
-public static final native long /*int*/ CALLBACK_selectedRange(long /*int*/ func);
+public static final native long CALLBACK_selectedRange(long func);
 /** @method callback_types=void;id;SEL;NSRect;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_setFrame_(long /*int*/ func);
+public static final native long CALLBACK_setFrame_(long func);
 /** @method callback_types=void;id;SEL;NSPoint;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_setFrameOrigin_(long /*int*/ func);
+public static final native long CALLBACK_setFrameOrigin_(long func);
 /** @method callback_types=void;id;SEL;NSSize;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_setFrameSize_(long /*int*/ func);
+public static final native long CALLBACK_setFrameSize_(long func);
 /** @method callback_types=void;id;SEL;id;NSRange;,callback_flags=none;none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_setMarkedText_selectedRange_(long /*int*/ func);
+public static final native long CALLBACK_setMarkedText_selectedRange_(long func);
 /** @method callback_types=void;id;SEL;NSRect;,callback_flags=none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_setNeedsDisplayInRect_(long /*int*/ func);
+public static final native long CALLBACK_setNeedsDisplayInRect_(long func);
 /** @method callback_types=BOOL;id;SEL;NSRange;NSString*;,callback_flags=none;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_shouldChangeTextInRange_replacementString_(long /*int*/ func);
+public static final native long CALLBACK_shouldChangeTextInRange_replacementString_(long func);
 /** @method callback_types=NSSize;id;SEL;BOOL;,callback_flags=struct;none;none;none; */
-public static final native long /*int*/ CALLBACK_sizeOfLabel_(long /*int*/ func);
+public static final native long CALLBACK_sizeOfLabel_(long func);
 /** @method callback_types=NSRange;id;SEL;NSTextView*;NSRange;NSRange;,callback_flags=struct;none;none;none;struct;struct; */
-public static final native long /*int*/ CALLBACK_textView_willChangeSelectionFromCharacterRange_toCharacterRange_(long /*int*/ func);
+public static final native long CALLBACK_textView_willChangeSelectionFromCharacterRange_toCharacterRange_(long func);
 /** @method callback_types=NSRect;id;SEL;NSRect;,callback_flags=struct;none;none;struct; */
-public static final native long /*int*/ CALLBACK_titleRectForBounds_(long /*int*/ func);
+public static final native long CALLBACK_titleRectForBounds_(long func);
 /** @method callback_types=NSString*;id;SEL;NSView*;NSToolTipTag;NSPoint;void*;,callback_flags=none;none;none;none;none;struct;none; */
-public static final native long /*int*/ CALLBACK_view_stringForToolTip_point_userData_(long /*int*/ func);
+public static final native long CALLBACK_view_stringForToolTip_point_userData_(long func);
 /** @method callback_types=void;id;SEL;WebView*;NSRect;,callback_flags=none;none;none;none;struct; */
-public static final native long /*int*/ CALLBACK_webView_setFrame_(long /*int*/ func);
+public static final native long CALLBACK_webView_setFrame_(long func);
 
 /** Classes */
-public static final long /*int*/ class_DOMDocument = objc_getClass("DOMDocument");
-public static final long /*int*/ class_DOMEvent = objc_getClass("DOMEvent");
-public static final long /*int*/ class_DOMKeyboardEvent = objc_getClass("DOMKeyboardEvent");
-public static final long /*int*/ class_DOMMouseEvent = objc_getClass("DOMMouseEvent");
-public static final long /*int*/ class_DOMUIEvent = objc_getClass("DOMUIEvent");
-public static final long /*int*/ class_DOMWheelEvent = objc_getClass("DOMWheelEvent");
-public static final long /*int*/ class_NSActionCell = objc_getClass("NSActionCell");
-public static final long /*int*/ class_NSAffineTransform = objc_getClass("NSAffineTransform");
-public static final long /*int*/ class_NSAlert = objc_getClass("NSAlert");
-public static final long /*int*/ class_NSAppearance = objc_getClass("NSAppearance");
-public static final long /*int*/ class_NSAppleEventDescriptor = objc_getClass("NSAppleEventDescriptor");
-public static final long /*int*/ class_NSApplication = objc_getClass("NSApplication");
-public static final long /*int*/ class_NSArray = objc_getClass("NSArray");
-public static final long /*int*/ class_NSAttributedString = objc_getClass("NSAttributedString");
-public static final long /*int*/ class_NSAutoreleasePool = objc_getClass("NSAutoreleasePool");
-public static final long /*int*/ class_NSBezierPath = objc_getClass("NSBezierPath");
-public static final long /*int*/ class_NSBitmapImageRep = objc_getClass("NSBitmapImageRep");
-public static final long /*int*/ class_NSBox = objc_getClass("NSBox");
-public static final long /*int*/ class_NSBrowserCell = objc_getClass("NSBrowserCell");
-public static final long /*int*/ class_NSBundle = objc_getClass("NSBundle");
-public static final long /*int*/ class_NSButton = objc_getClass("NSButton");
-public static final long /*int*/ class_NSButtonCell = objc_getClass("NSButtonCell");
-public static final long /*int*/ class_NSCalendarDate = objc_getClass("NSCalendarDate");
-public static final long /*int*/ class_NSCell = objc_getClass("NSCell");
-public static final long /*int*/ class_NSCharacterSet = objc_getClass("NSCharacterSet");
-public static final long /*int*/ class_NSClipView = objc_getClass("NSClipView");
-public static final long /*int*/ class_NSCoder = objc_getClass("NSCoder");
-public static final long /*int*/ class_NSColor = objc_getClass("NSColor");
-public static final long /*int*/ class_NSColorList = objc_getClass("NSColorList");
-public static final long /*int*/ class_NSColorPanel = objc_getClass("NSColorPanel");
-public static final long /*int*/ class_NSColorSpace = objc_getClass("NSColorSpace");
-public static final long /*int*/ class_NSComboBox = objc_getClass("NSComboBox");
-public static final long /*int*/ class_NSComboBoxCell = objc_getClass("NSComboBoxCell");
-public static final long /*int*/ class_NSControl = objc_getClass("NSControl");
-public static final long /*int*/ class_NSCursor = objc_getClass("NSCursor");
-public static final long /*int*/ class_NSData = objc_getClass("NSData");
-public static final long /*int*/ class_NSDate = objc_getClass("NSDate");
-public static final long /*int*/ class_NSDatePicker = objc_getClass("NSDatePicker");
-public static final long /*int*/ class_NSDictionary = objc_getClass("NSDictionary");
-public static final long /*int*/ class_NSDirectoryEnumerator = objc_getClass("NSDirectoryEnumerator");
-public static final long /*int*/ class_NSDockTile = objc_getClass("NSDockTile");
-public static final long /*int*/ class_NSEnumerator = objc_getClass("NSEnumerator");
-public static final long /*int*/ class_NSError = objc_getClass("NSError");
-public static final long /*int*/ class_NSEvent = objc_getClass("NSEvent");
-public static final long /*int*/ class_NSFileManager = objc_getClass("NSFileManager");
-public static final long /*int*/ class_NSFileWrapper = objc_getClass("NSFileWrapper");
-public static final long /*int*/ class_NSFont = objc_getClass("NSFont");
-public static final long /*int*/ class_NSFontManager = objc_getClass("NSFontManager");
-public static final long /*int*/ class_NSFontPanel = objc_getClass("NSFontPanel");
-public static final long /*int*/ class_NSFormatter = objc_getClass("NSFormatter");
-public static final long /*int*/ class_NSGradient = objc_getClass("NSGradient");
-public static final long /*int*/ class_NSGraphicsContext = objc_getClass("NSGraphicsContext");
-public static final long /*int*/ class_NSHTTPCookie = objc_getClass("NSHTTPCookie");
-public static final long /*int*/ class_NSHTTPCookieStorage = objc_getClass("NSHTTPCookieStorage");
-public static final long /*int*/ class_NSImage = objc_getClass("NSImage");
-public static final long /*int*/ class_NSImageRep = objc_getClass("NSImageRep");
-public static final long /*int*/ class_NSImageView = objc_getClass("NSImageView");
-public static final long /*int*/ class_NSIndexSet = objc_getClass("NSIndexSet");
-public static final long /*int*/ class_NSInputManager = objc_getClass("NSInputManager");
-public static final long /*int*/ class_NSKeyedArchiver = objc_getClass("NSKeyedArchiver");
-public static final long /*int*/ class_NSKeyedUnarchiver = objc_getClass("NSKeyedUnarchiver");
-public static final long /*int*/ class_NSLayoutManager = objc_getClass("NSLayoutManager");
-public static final long /*int*/ class_NSLocale = objc_getClass("NSLocale");
-public static final long /*int*/ class_NSMenu = objc_getClass("NSMenu");
-public static final long /*int*/ class_NSMenuItem = objc_getClass("NSMenuItem");
-public static final long /*int*/ class_NSMutableArray = objc_getClass("NSMutableArray");
-public static final long /*int*/ class_NSMutableAttributedString = objc_getClass("NSMutableAttributedString");
-public static final long /*int*/ class_NSMutableDictionary = objc_getClass("NSMutableDictionary");
-public static final long /*int*/ class_NSMutableIndexSet = objc_getClass("NSMutableIndexSet");
-public static final long /*int*/ class_NSMutableParagraphStyle = objc_getClass("NSMutableParagraphStyle");
-public static final long /*int*/ class_NSMutableSet = objc_getClass("NSMutableSet");
-public static final long /*int*/ class_NSMutableString = objc_getClass("NSMutableString");
-public static final long /*int*/ class_NSMutableURLRequest = objc_getClass("NSMutableURLRequest");
-public static final long /*int*/ class_NSNotification = objc_getClass("NSNotification");
-public static final long /*int*/ class_NSNotificationCenter = objc_getClass("NSNotificationCenter");
-public static final long /*int*/ class_NSNumber = objc_getClass("NSNumber");
-public static final long /*int*/ class_NSNumberFormatter = objc_getClass("NSNumberFormatter");
-public static final long /*int*/ class_NSObject = objc_getClass("NSObject");
-public static final long /*int*/ class_NSOpenGLContext = objc_getClass("NSOpenGLContext");
-public static final long /*int*/ class_NSOpenGLPixelFormat = objc_getClass("NSOpenGLPixelFormat");
-public static final long /*int*/ class_NSOpenPanel = objc_getClass("NSOpenPanel");
-public static final long /*int*/ class_NSOutlineView = objc_getClass("NSOutlineView");
-public static final long /*int*/ class_NSPanel = objc_getClass("NSPanel");
-public static final long /*int*/ class_NSParagraphStyle = objc_getClass("NSParagraphStyle");
-public static final long /*int*/ class_NSPasteboard = objc_getClass("NSPasteboard");
-public static final long /*int*/ class_NSPopUpButton = objc_getClass("NSPopUpButton");
-public static final long /*int*/ class_NSPrintInfo = objc_getClass("NSPrintInfo");
-public static final long /*int*/ class_NSPrintOperation = objc_getClass("NSPrintOperation");
-public static final long /*int*/ class_NSPrintPanel = objc_getClass("NSPrintPanel");
-public static final long /*int*/ class_NSPrinter = objc_getClass("NSPrinter");
-public static final long /*int*/ class_NSProgressIndicator = objc_getClass("NSProgressIndicator");
-public static final long /*int*/ class_NSResponder = objc_getClass("NSResponder");
-public static final long /*int*/ class_NSRunLoop = objc_getClass("NSRunLoop");
-public static final long /*int*/ class_NSRunningApplication = objc_getClass("NSRunningApplication");
-public static final long /*int*/ class_NSSavePanel = objc_getClass("NSSavePanel");
-public static final long /*int*/ class_NSScreen = objc_getClass("NSScreen");
-public static final long /*int*/ class_NSScrollView = objc_getClass("NSScrollView");
-public static final long /*int*/ class_NSScroller = objc_getClass("NSScroller");
-public static final long /*int*/ class_NSSearchField = objc_getClass("NSSearchField");
-public static final long /*int*/ class_NSSearchFieldCell = objc_getClass("NSSearchFieldCell");
-public static final long /*int*/ class_NSSecureTextField = objc_getClass("NSSecureTextField");
-public static final long /*int*/ class_NSSegmentedCell = objc_getClass("NSSegmentedCell");
-public static final long /*int*/ class_NSSet = objc_getClass("NSSet");
-public static final long /*int*/ class_NSSlider = objc_getClass("NSSlider");
-public static final long /*int*/ class_NSStatusBar = objc_getClass("NSStatusBar");
-public static final long /*int*/ class_NSStatusItem = objc_getClass("NSStatusItem");
-public static final long /*int*/ class_NSStepper = objc_getClass("NSStepper");
-public static final long /*int*/ class_NSString = objc_getClass("NSString");
-public static final long /*int*/ class_NSTabView = objc_getClass("NSTabView");
-public static final long /*int*/ class_NSTabViewItem = objc_getClass("NSTabViewItem");
-public static final long /*int*/ class_NSTableColumn = objc_getClass("NSTableColumn");
-public static final long /*int*/ class_NSTableHeaderCell = objc_getClass("NSTableHeaderCell");
-public static final long /*int*/ class_NSTableHeaderView = objc_getClass("NSTableHeaderView");
-public static final long /*int*/ class_NSTableView = objc_getClass("NSTableView");
-public static final long /*int*/ class_NSText = objc_getClass("NSText");
-public static final long /*int*/ class_NSTextAttachment = objc_getClass("NSTextAttachment");
-public static final long /*int*/ class_NSTextContainer = objc_getClass("NSTextContainer");
-public static final long /*int*/ class_NSTextField = objc_getClass("NSTextField");
-public static final long /*int*/ class_NSTextFieldCell = objc_getClass("NSTextFieldCell");
-public static final long /*int*/ class_NSTextStorage = objc_getClass("NSTextStorage");
-public static final long /*int*/ class_NSTextTab = objc_getClass("NSTextTab");
-public static final long /*int*/ class_NSTextView = objc_getClass("NSTextView");
-public static final long /*int*/ class_NSThread = objc_getClass("NSThread");
-public static final long /*int*/ class_NSTimeZone = objc_getClass("NSTimeZone");
-public static final long /*int*/ class_NSTimer = objc_getClass("NSTimer");
-public static final long /*int*/ class_NSToolbar = objc_getClass("NSToolbar");
-public static final long /*int*/ class_NSToolbarItem = objc_getClass("NSToolbarItem");
-public static final long /*int*/ class_NSTouch = objc_getClass("NSTouch");
-public static final long /*int*/ class_NSTrackingArea = objc_getClass("NSTrackingArea");
-public static final long /*int*/ class_NSTypesetter = objc_getClass("NSTypesetter");
-public static final long /*int*/ class_NSURL = objc_getClass("NSURL");
-public static final long /*int*/ class_NSURLAuthenticationChallenge = objc_getClass("NSURLAuthenticationChallenge");
-public static final long /*int*/ class_NSURLCredential = objc_getClass("NSURLCredential");
-public static final long /*int*/ class_NSURLDownload = objc_getClass("NSURLDownload");
-public static final long /*int*/ class_NSURLProtectionSpace = objc_getClass("NSURLProtectionSpace");
-public static final long /*int*/ class_NSURLRequest = objc_getClass("NSURLRequest");
-public static final long /*int*/ class_NSUndoManager = objc_getClass("NSUndoManager");
-public static final long /*int*/ class_NSUserDefaults = objc_getClass("NSUserDefaults");
-public static final long /*int*/ class_NSValue = objc_getClass("NSValue");
-public static final long /*int*/ class_NSView = objc_getClass("NSView");
-public static final long /*int*/ class_NSWindow = objc_getClass("NSWindow");
-public static final long /*int*/ class_NSWorkspace = objc_getClass("NSWorkspace");
-public static final long /*int*/ class_SFCertificatePanel = objc_getClass("SFCertificatePanel");
-public static final long /*int*/ class_SFCertificateTrustPanel = objc_getClass("SFCertificateTrustPanel");
-public static final long /*int*/ class_WebDataSource = objc_getClass("WebDataSource");
-public static final long /*int*/ class_WebFrame = objc_getClass("WebFrame");
-public static final long /*int*/ class_WebFrameView = objc_getClass("WebFrameView");
-public static final long /*int*/ class_WebPreferences = objc_getClass("WebPreferences");
-public static final long /*int*/ class_WebScriptObject = objc_getClass("WebScriptObject");
-public static final long /*int*/ class_WebUndefined = objc_getClass("WebUndefined");
-public static final long /*int*/ class_WebView = objc_getClass("WebView");
+public static final long class_DOMDocument = objc_getClass("DOMDocument");
+public static final long class_DOMEvent = objc_getClass("DOMEvent");
+public static final long class_DOMKeyboardEvent = objc_getClass("DOMKeyboardEvent");
+public static final long class_DOMMouseEvent = objc_getClass("DOMMouseEvent");
+public static final long class_DOMUIEvent = objc_getClass("DOMUIEvent");
+public static final long class_DOMWheelEvent = objc_getClass("DOMWheelEvent");
+public static final long class_NSActionCell = objc_getClass("NSActionCell");
+public static final long class_NSAffineTransform = objc_getClass("NSAffineTransform");
+public static final long class_NSAlert = objc_getClass("NSAlert");
+public static final long class_NSAppearance = objc_getClass("NSAppearance");
+public static final long class_NSAppleEventDescriptor = objc_getClass("NSAppleEventDescriptor");
+public static final long class_NSApplication = objc_getClass("NSApplication");
+public static final long class_NSArray = objc_getClass("NSArray");
+public static final long class_NSAttributedString = objc_getClass("NSAttributedString");
+public static final long class_NSAutoreleasePool = objc_getClass("NSAutoreleasePool");
+public static final long class_NSBezierPath = objc_getClass("NSBezierPath");
+public static final long class_NSBitmapImageRep = objc_getClass("NSBitmapImageRep");
+public static final long class_NSBox = objc_getClass("NSBox");
+public static final long class_NSBrowserCell = objc_getClass("NSBrowserCell");
+public static final long class_NSBundle = objc_getClass("NSBundle");
+public static final long class_NSButton = objc_getClass("NSButton");
+public static final long class_NSButtonCell = objc_getClass("NSButtonCell");
+public static final long class_NSCalendarDate = objc_getClass("NSCalendarDate");
+public static final long class_NSCell = objc_getClass("NSCell");
+public static final long class_NSCharacterSet = objc_getClass("NSCharacterSet");
+public static final long class_NSClipView = objc_getClass("NSClipView");
+public static final long class_NSCoder = objc_getClass("NSCoder");
+public static final long class_NSColor = objc_getClass("NSColor");
+public static final long class_NSColorList = objc_getClass("NSColorList");
+public static final long class_NSColorPanel = objc_getClass("NSColorPanel");
+public static final long class_NSColorSpace = objc_getClass("NSColorSpace");
+public static final long class_NSComboBox = objc_getClass("NSComboBox");
+public static final long class_NSComboBoxCell = objc_getClass("NSComboBoxCell");
+public static final long class_NSControl = objc_getClass("NSControl");
+public static final long class_NSCursor = objc_getClass("NSCursor");
+public static final long class_NSData = objc_getClass("NSData");
+public static final long class_NSDate = objc_getClass("NSDate");
+public static final long class_NSDatePicker = objc_getClass("NSDatePicker");
+public static final long class_NSDictionary = objc_getClass("NSDictionary");
+public static final long class_NSDirectoryEnumerator = objc_getClass("NSDirectoryEnumerator");
+public static final long class_NSDockTile = objc_getClass("NSDockTile");
+public static final long class_NSEnumerator = objc_getClass("NSEnumerator");
+public static final long class_NSError = objc_getClass("NSError");
+public static final long class_NSEvent = objc_getClass("NSEvent");
+public static final long class_NSFileManager = objc_getClass("NSFileManager");
+public static final long class_NSFileWrapper = objc_getClass("NSFileWrapper");
+public static final long class_NSFont = objc_getClass("NSFont");
+public static final long class_NSFontManager = objc_getClass("NSFontManager");
+public static final long class_NSFontPanel = objc_getClass("NSFontPanel");
+public static final long class_NSFormatter = objc_getClass("NSFormatter");
+public static final long class_NSGradient = objc_getClass("NSGradient");
+public static final long class_NSGraphicsContext = objc_getClass("NSGraphicsContext");
+public static final long class_NSHTTPCookie = objc_getClass("NSHTTPCookie");
+public static final long class_NSHTTPCookieStorage = objc_getClass("NSHTTPCookieStorage");
+public static final long class_NSImage = objc_getClass("NSImage");
+public static final long class_NSImageRep = objc_getClass("NSImageRep");
+public static final long class_NSImageView = objc_getClass("NSImageView");
+public static final long class_NSIndexSet = objc_getClass("NSIndexSet");
+public static final long class_NSInputManager = objc_getClass("NSInputManager");
+public static final long class_NSKeyedArchiver = objc_getClass("NSKeyedArchiver");
+public static final long class_NSKeyedUnarchiver = objc_getClass("NSKeyedUnarchiver");
+public static final long class_NSLayoutManager = objc_getClass("NSLayoutManager");
+public static final long class_NSLocale = objc_getClass("NSLocale");
+public static final long class_NSMenu = objc_getClass("NSMenu");
+public static final long class_NSMenuItem = objc_getClass("NSMenuItem");
+public static final long class_NSMutableArray = objc_getClass("NSMutableArray");
+public static final long class_NSMutableAttributedString = objc_getClass("NSMutableAttributedString");
+public static final long class_NSMutableDictionary = objc_getClass("NSMutableDictionary");
+public static final long class_NSMutableIndexSet = objc_getClass("NSMutableIndexSet");
+public static final long class_NSMutableParagraphStyle = objc_getClass("NSMutableParagraphStyle");
+public static final long class_NSMutableSet = objc_getClass("NSMutableSet");
+public static final long class_NSMutableString = objc_getClass("NSMutableString");
+public static final long class_NSMutableURLRequest = objc_getClass("NSMutableURLRequest");
+public static final long class_NSNotification = objc_getClass("NSNotification");
+public static final long class_NSNotificationCenter = objc_getClass("NSNotificationCenter");
+public static final long class_NSNumber = objc_getClass("NSNumber");
+public static final long class_NSNumberFormatter = objc_getClass("NSNumberFormatter");
+public static final long class_NSObject = objc_getClass("NSObject");
+public static final long class_NSOpenGLContext = objc_getClass("NSOpenGLContext");
+public static final long class_NSOpenGLPixelFormat = objc_getClass("NSOpenGLPixelFormat");
+public static final long class_NSOpenPanel = objc_getClass("NSOpenPanel");
+public static final long class_NSOutlineView = objc_getClass("NSOutlineView");
+public static final long class_NSPanel = objc_getClass("NSPanel");
+public static final long class_NSParagraphStyle = objc_getClass("NSParagraphStyle");
+public static final long class_NSPasteboard = objc_getClass("NSPasteboard");
+public static final long class_NSPopUpButton = objc_getClass("NSPopUpButton");
+public static final long class_NSPrintInfo = objc_getClass("NSPrintInfo");
+public static final long class_NSPrintOperation = objc_getClass("NSPrintOperation");
+public static final long class_NSPrintPanel = objc_getClass("NSPrintPanel");
+public static final long class_NSPrinter = objc_getClass("NSPrinter");
+public static final long class_NSProgressIndicator = objc_getClass("NSProgressIndicator");
+public static final long class_NSResponder = objc_getClass("NSResponder");
+public static final long class_NSRunLoop = objc_getClass("NSRunLoop");
+public static final long class_NSRunningApplication = objc_getClass("NSRunningApplication");
+public static final long class_NSSavePanel = objc_getClass("NSSavePanel");
+public static final long class_NSScreen = objc_getClass("NSScreen");
+public static final long class_NSScrollView = objc_getClass("NSScrollView");
+public static final long class_NSScroller = objc_getClass("NSScroller");
+public static final long class_NSSearchField = objc_getClass("NSSearchField");
+public static final long class_NSSearchFieldCell = objc_getClass("NSSearchFieldCell");
+public static final long class_NSSecureTextField = objc_getClass("NSSecureTextField");
+public static final long class_NSSegmentedCell = objc_getClass("NSSegmentedCell");
+public static final long class_NSSet = objc_getClass("NSSet");
+public static final long class_NSSlider = objc_getClass("NSSlider");
+public static final long class_NSStatusBar = objc_getClass("NSStatusBar");
+public static final long class_NSStatusItem = objc_getClass("NSStatusItem");
+public static final long class_NSStepper = objc_getClass("NSStepper");
+public static final long class_NSString = objc_getClass("NSString");
+public static final long class_NSTabView = objc_getClass("NSTabView");
+public static final long class_NSTabViewItem = objc_getClass("NSTabViewItem");
+public static final long class_NSTableColumn = objc_getClass("NSTableColumn");
+public static final long class_NSTableHeaderCell = objc_getClass("NSTableHeaderCell");
+public static final long class_NSTableHeaderView = objc_getClass("NSTableHeaderView");
+public static final long class_NSTableView = objc_getClass("NSTableView");
+public static final long class_NSText = objc_getClass("NSText");
+public static final long class_NSTextAttachment = objc_getClass("NSTextAttachment");
+public static final long class_NSTextContainer = objc_getClass("NSTextContainer");
+public static final long class_NSTextField = objc_getClass("NSTextField");
+public static final long class_NSTextFieldCell = objc_getClass("NSTextFieldCell");
+public static final long class_NSTextStorage = objc_getClass("NSTextStorage");
+public static final long class_NSTextTab = objc_getClass("NSTextTab");
+public static final long class_NSTextView = objc_getClass("NSTextView");
+public static final long class_NSThread = objc_getClass("NSThread");
+public static final long class_NSTimeZone = objc_getClass("NSTimeZone");
+public static final long class_NSTimer = objc_getClass("NSTimer");
+public static final long class_NSToolbar = objc_getClass("NSToolbar");
+public static final long class_NSToolbarItem = objc_getClass("NSToolbarItem");
+public static final long class_NSTouch = objc_getClass("NSTouch");
+public static final long class_NSTrackingArea = objc_getClass("NSTrackingArea");
+public static final long class_NSTypesetter = objc_getClass("NSTypesetter");
+public static final long class_NSURL = objc_getClass("NSURL");
+public static final long class_NSURLAuthenticationChallenge = objc_getClass("NSURLAuthenticationChallenge");
+public static final long class_NSURLCredential = objc_getClass("NSURLCredential");
+public static final long class_NSURLDownload = objc_getClass("NSURLDownload");
+public static final long class_NSURLProtectionSpace = objc_getClass("NSURLProtectionSpace");
+public static final long class_NSURLRequest = objc_getClass("NSURLRequest");
+public static final long class_NSUndoManager = objc_getClass("NSUndoManager");
+public static final long class_NSUserDefaults = objc_getClass("NSUserDefaults");
+public static final long class_NSValue = objc_getClass("NSValue");
+public static final long class_NSView = objc_getClass("NSView");
+public static final long class_NSWindow = objc_getClass("NSWindow");
+public static final long class_NSWorkspace = objc_getClass("NSWorkspace");
+public static final long class_SFCertificatePanel = objc_getClass("SFCertificatePanel");
+public static final long class_SFCertificateTrustPanel = objc_getClass("SFCertificateTrustPanel");
+public static final long class_WebDataSource = objc_getClass("WebDataSource");
+public static final long class_WebFrame = objc_getClass("WebFrame");
+public static final long class_WebFrameView = objc_getClass("WebFrameView");
+public static final long class_WebPreferences = objc_getClass("WebPreferences");
+public static final long class_WebScriptObject = objc_getClass("WebScriptObject");
+public static final long class_WebUndefined = objc_getClass("WebUndefined");
+public static final long class_WebView = objc_getClass("WebView");
 
 /** Protocols */
-public static final long /*int*/ protocol_NSAccessibility = objc_getProtocol("NSAccessibility");
-public static final long /*int*/ protocol_NSAccessibilityAdditions = objc_getProtocol("NSAccessibilityAdditions");
-public static final long /*int*/ protocol_NSAppearanceCustomization = objc_getProtocol("NSAppearanceCustomization");
-public static final long /*int*/ protocol_NSApplicationDelegate = objc_getProtocol("NSApplicationDelegate");
-public static final long /*int*/ protocol_NSApplicationNotifications = objc_getProtocol("NSApplicationNotifications");
-public static final long /*int*/ protocol_NSColorPanelResponderMethod = objc_getProtocol("NSColorPanelResponderMethod");
-public static final long /*int*/ protocol_NSComboBoxNotifications = objc_getProtocol("NSComboBoxNotifications");
-public static final long /*int*/ protocol_NSDraggingDestination = objc_getProtocol("NSDraggingDestination");
-public static final long /*int*/ protocol_NSDraggingSource = objc_getProtocol("NSDraggingSource");
-public static final long /*int*/ protocol_NSFontManagerResponderMethod = objc_getProtocol("NSFontManagerResponderMethod");
-public static final long /*int*/ protocol_NSFontPanelValidationAdditions = objc_getProtocol("NSFontPanelValidationAdditions");
-public static final long /*int*/ protocol_NSMenuDelegate = objc_getProtocol("NSMenuDelegate");
-public static final long /*int*/ protocol_NSMenuValidation = objc_getProtocol("NSMenuValidation");
-public static final long /*int*/ protocol_NSOutlineViewDataSource = objc_getProtocol("NSOutlineViewDataSource");
-public static final long /*int*/ protocol_NSOutlineViewDelegate = objc_getProtocol("NSOutlineViewDelegate");
-public static final long /*int*/ protocol_NSOutlineViewNotifications = objc_getProtocol("NSOutlineViewNotifications");
-public static final long /*int*/ protocol_NSPasteboardOwner = objc_getProtocol("NSPasteboardOwner");
-public static final long /*int*/ protocol_NSSavePanelDelegate = objc_getProtocol("NSSavePanelDelegate");
-public static final long /*int*/ protocol_NSTabViewDelegate = objc_getProtocol("NSTabViewDelegate");
-public static final long /*int*/ protocol_NSTableDataSource = objc_getProtocol("NSTableDataSource");
-public static final long /*int*/ protocol_NSTableViewDelegate = objc_getProtocol("NSTableViewDelegate");
-public static final long /*int*/ protocol_NSTableViewNotifications = objc_getProtocol("NSTableViewNotifications");
-public static final long /*int*/ protocol_NSTextAttachmentCell = objc_getProtocol("NSTextAttachmentCell");
-public static final long /*int*/ protocol_NSTextDelegate = objc_getProtocol("NSTextDelegate");
-public static final long /*int*/ protocol_NSTextInput = objc_getProtocol("NSTextInput");
-public static final long /*int*/ protocol_NSTextViewDelegate = objc_getProtocol("NSTextViewDelegate");
-public static final long /*int*/ protocol_NSToolTipOwner = objc_getProtocol("NSToolTipOwner");
-public static final long /*int*/ protocol_NSToolbarDelegate = objc_getProtocol("NSToolbarDelegate");
-public static final long /*int*/ protocol_NSToolbarNotifications = objc_getProtocol("NSToolbarNotifications");
-public static final long /*int*/ protocol_NSURLDownloadDelegate = objc_getProtocol("NSURLDownloadDelegate");
-public static final long /*int*/ protocol_NSWindowDelegate = objc_getProtocol("NSWindowDelegate");
-public static final long /*int*/ protocol_NSWindowNotifications = objc_getProtocol("NSWindowNotifications");
-public static final long /*int*/ protocol_WebDocumentRepresentation = objc_getProtocol("WebDocumentRepresentation");
-public static final long /*int*/ protocol_WebFrameLoadDelegate = objc_getProtocol("WebFrameLoadDelegate");
-public static final long /*int*/ protocol_WebOpenPanelResultListener = objc_getProtocol("WebOpenPanelResultListener");
-public static final long /*int*/ protocol_WebPolicyDecisionListener = objc_getProtocol("WebPolicyDecisionListener");
-public static final long /*int*/ protocol_WebPolicyDelegate = objc_getProtocol("WebPolicyDelegate");
-public static final long /*int*/ protocol_WebResourceLoadDelegate = objc_getProtocol("WebResourceLoadDelegate");
-public static final long /*int*/ protocol_WebUIDelegate = objc_getProtocol("WebUIDelegate");
+public static final long protocol_NSAccessibility = objc_getProtocol("NSAccessibility");
+public static final long protocol_NSAccessibilityAdditions = objc_getProtocol("NSAccessibilityAdditions");
+public static final long protocol_NSAppearanceCustomization = objc_getProtocol("NSAppearanceCustomization");
+public static final long protocol_NSApplicationDelegate = objc_getProtocol("NSApplicationDelegate");
+public static final long protocol_NSApplicationNotifications = objc_getProtocol("NSApplicationNotifications");
+public static final long protocol_NSColorPanelResponderMethod = objc_getProtocol("NSColorPanelResponderMethod");
+public static final long protocol_NSComboBoxNotifications = objc_getProtocol("NSComboBoxNotifications");
+public static final long protocol_NSDraggingDestination = objc_getProtocol("NSDraggingDestination");
+public static final long protocol_NSDraggingSource = objc_getProtocol("NSDraggingSource");
+public static final long protocol_NSFontManagerResponderMethod = objc_getProtocol("NSFontManagerResponderMethod");
+public static final long protocol_NSFontPanelValidationAdditions = objc_getProtocol("NSFontPanelValidationAdditions");
+public static final long protocol_NSMenuDelegate = objc_getProtocol("NSMenuDelegate");
+public static final long protocol_NSMenuValidation = objc_getProtocol("NSMenuValidation");
+public static final long protocol_NSOutlineViewDataSource = objc_getProtocol("NSOutlineViewDataSource");
+public static final long protocol_NSOutlineViewDelegate = objc_getProtocol("NSOutlineViewDelegate");
+public static final long protocol_NSOutlineViewNotifications = objc_getProtocol("NSOutlineViewNotifications");
+public static final long protocol_NSPasteboardOwner = objc_getProtocol("NSPasteboardOwner");
+public static final long protocol_NSSavePanelDelegate = objc_getProtocol("NSSavePanelDelegate");
+public static final long protocol_NSTabViewDelegate = objc_getProtocol("NSTabViewDelegate");
+public static final long protocol_NSTableDataSource = objc_getProtocol("NSTableDataSource");
+public static final long protocol_NSTableViewDelegate = objc_getProtocol("NSTableViewDelegate");
+public static final long protocol_NSTableViewNotifications = objc_getProtocol("NSTableViewNotifications");
+public static final long protocol_NSTextAttachmentCell = objc_getProtocol("NSTextAttachmentCell");
+public static final long protocol_NSTextDelegate = objc_getProtocol("NSTextDelegate");
+public static final long protocol_NSTextInput = objc_getProtocol("NSTextInput");
+public static final long protocol_NSTextViewDelegate = objc_getProtocol("NSTextViewDelegate");
+public static final long protocol_NSToolTipOwner = objc_getProtocol("NSToolTipOwner");
+public static final long protocol_NSToolbarDelegate = objc_getProtocol("NSToolbarDelegate");
+public static final long protocol_NSToolbarNotifications = objc_getProtocol("NSToolbarNotifications");
+public static final long protocol_NSURLDownloadDelegate = objc_getProtocol("NSURLDownloadDelegate");
+public static final long protocol_NSWindowDelegate = objc_getProtocol("NSWindowDelegate");
+public static final long protocol_NSWindowNotifications = objc_getProtocol("NSWindowNotifications");
+public static final long protocol_WebDocumentRepresentation = objc_getProtocol("WebDocumentRepresentation");
+public static final long protocol_WebFrameLoadDelegate = objc_getProtocol("WebFrameLoadDelegate");
+public static final long protocol_WebOpenPanelResultListener = objc_getProtocol("WebOpenPanelResultListener");
+public static final long protocol_WebPolicyDecisionListener = objc_getProtocol("WebPolicyDecisionListener");
+public static final long protocol_WebPolicyDelegate = objc_getProtocol("WebPolicyDelegate");
+public static final long protocol_WebResourceLoadDelegate = objc_getProtocol("WebResourceLoadDelegate");
+public static final long protocol_WebUIDelegate = objc_getProtocol("WebUIDelegate");
 
 /** Selectors */
 private static java.util.Map<Long,Selector> SELECTORS;
@@ -995,1415 +995,1415 @@ public static void registerSelector (Long value, Selector selector) {
 public static Selector getSelector (long value) {
 	return SELECTORS.get(value);
 }
-public static final long /*int*/ sel_CGEvent = Selector.sel_CGEvent.value;
-public static final long /*int*/ sel_DOMDocument = Selector.sel_DOMDocument.value;
-public static final long /*int*/ sel_IBeamCursor = Selector.sel_IBeamCursor.value;
-public static final long /*int*/ sel_PMPrintSession = Selector.sel_PMPrintSession.value;
-public static final long /*int*/ sel_PMPrintSettings = Selector.sel_PMPrintSettings.value;
-public static final long /*int*/ sel_TIFFRepresentation = Selector.sel_TIFFRepresentation.value;
-public static final long /*int*/ sel_URL = Selector.sel_URL.value;
-public static final long /*int*/ sel_URLFromPasteboard_ = Selector.sel_URLFromPasteboard_.value;
-public static final long /*int*/ sel_URLWithString_ = Selector.sel_URLWithString_.value;
-public static final long /*int*/ sel_URLsForDirectory_inDomains_ = Selector.sel_URLsForDirectory_inDomains_.value;
-public static final long /*int*/ sel_UTF8String = Selector.sel_UTF8String.value;
-public static final long /*int*/ sel_abortEditing = Selector.sel_abortEditing.value;
-public static final long /*int*/ sel_absoluteString = Selector.sel_absoluteString.value;
-public static final long /*int*/ sel_acceptsFirstMouse_ = Selector.sel_acceptsFirstMouse_.value;
-public static final long /*int*/ sel_acceptsFirstResponder = Selector.sel_acceptsFirstResponder.value;
-public static final long /*int*/ sel_accessibilityActionDescription_ = Selector.sel_accessibilityActionDescription_.value;
-public static final long /*int*/ sel_accessibilityActionNames = Selector.sel_accessibilityActionNames.value;
-public static final long /*int*/ sel_accessibilityAttributeNames = Selector.sel_accessibilityAttributeNames.value;
-public static final long /*int*/ sel_accessibilityAttributeValue_ = Selector.sel_accessibilityAttributeValue_.value;
-public static final long /*int*/ sel_accessibilityAttributeValue_forParameter_ = Selector.sel_accessibilityAttributeValue_forParameter_.value;
-public static final long /*int*/ sel_accessibilityFocusedUIElement = Selector.sel_accessibilityFocusedUIElement.value;
-public static final long /*int*/ sel_accessibilityHitTest_ = Selector.sel_accessibilityHitTest_.value;
-public static final long /*int*/ sel_accessibilityIsAttributeSettable_ = Selector.sel_accessibilityIsAttributeSettable_.value;
-public static final long /*int*/ sel_accessibilityIsIgnored = Selector.sel_accessibilityIsIgnored.value;
-public static final long /*int*/ sel_accessibilityParameterizedAttributeNames = Selector.sel_accessibilityParameterizedAttributeNames.value;
-public static final long /*int*/ sel_accessibilityPerformAction_ = Selector.sel_accessibilityPerformAction_.value;
-public static final long /*int*/ sel_accessibilitySetOverrideValue_forAttribute_ = Selector.sel_accessibilitySetOverrideValue_forAttribute_.value;
-public static final long /*int*/ sel_accessibilitySetValue_forAttribute_ = Selector.sel_accessibilitySetValue_forAttribute_.value;
-public static final long /*int*/ sel_action = Selector.sel_action.value;
-public static final long /*int*/ sel_activateIgnoringOtherApps_ = Selector.sel_activateIgnoringOtherApps_.value;
-public static final long /*int*/ sel_activateWithOptions_ = Selector.sel_activateWithOptions_.value;
-public static final long /*int*/ sel_addAttribute_value_range_ = Selector.sel_addAttribute_value_range_.value;
-public static final long /*int*/ sel_addButtonWithTitle_ = Selector.sel_addButtonWithTitle_.value;
-public static final long /*int*/ sel_addChildWindow_ordered_ = Selector.sel_addChildWindow_ordered_.value;
-public static final long /*int*/ sel_addClip = Selector.sel_addClip.value;
-public static final long /*int*/ sel_addEventListener_listener_useCapture_ = Selector.sel_addEventListener_listener_useCapture_.value;
-public static final long /*int*/ sel_addIndex_ = Selector.sel_addIndex_.value;
-public static final long /*int*/ sel_addItem_ = Selector.sel_addItem_.value;
-public static final long /*int*/ sel_addItemWithObjectValue_ = Selector.sel_addItemWithObjectValue_.value;
-public static final long /*int*/ sel_addItemWithTitle_action_keyEquivalent_ = Selector.sel_addItemWithTitle_action_keyEquivalent_.value;
-public static final long /*int*/ sel_addLayoutManager_ = Selector.sel_addLayoutManager_.value;
-public static final long /*int*/ sel_addObject_ = Selector.sel_addObject_.value;
-public static final long /*int*/ sel_addObjectsFromArray_ = Selector.sel_addObjectsFromArray_.value;
-public static final long /*int*/ sel_addObserver_selector_name_object_ = Selector.sel_addObserver_selector_name_object_.value;
-public static final long /*int*/ sel_addRepresentation_ = Selector.sel_addRepresentation_.value;
-public static final long /*int*/ sel_addSubview_ = Selector.sel_addSubview_.value;
-public static final long /*int*/ sel_addSubview_positioned_relativeTo_ = Selector.sel_addSubview_positioned_relativeTo_.value;
-public static final long /*int*/ sel_addTabStop_ = Selector.sel_addTabStop_.value;
-public static final long /*int*/ sel_addTabViewItem_ = Selector.sel_addTabViewItem_.value;
-public static final long /*int*/ sel_addTableColumn_ = Selector.sel_addTableColumn_.value;
-public static final long /*int*/ sel_addTemporaryAttribute_value_forCharacterRange_ = Selector.sel_addTemporaryAttribute_value_forCharacterRange_.value;
-public static final long /*int*/ sel_addTextContainer_ = Selector.sel_addTextContainer_.value;
-public static final long /*int*/ sel_addTimer_forMode_ = Selector.sel_addTimer_forMode_.value;
-public static final long /*int*/ sel_addToolTipRect_owner_userData_ = Selector.sel_addToolTipRect_owner_userData_.value;
-public static final long /*int*/ sel_addTypes_owner_ = Selector.sel_addTypes_owner_.value;
-public static final long /*int*/ sel_alignment = Selector.sel_alignment.value;
-public static final long /*int*/ sel_allKeys = Selector.sel_allKeys.value;
-public static final long /*int*/ sel_allObjects = Selector.sel_allObjects.value;
-public static final long /*int*/ sel_alloc = Selector.sel_alloc.value;
-public static final long /*int*/ sel_allowsColumnReordering = Selector.sel_allowsColumnReordering.value;
-public static final long /*int*/ sel_allowsFloats = Selector.sel_allowsFloats.value;
-public static final long /*int*/ sel_alphaComponent = Selector.sel_alphaComponent.value;
-public static final long /*int*/ sel_alphaValue = Selector.sel_alphaValue.value;
-public static final long /*int*/ sel_altKey = Selector.sel_altKey.value;
-public static final long /*int*/ sel_alternateSelectedControlColor = Selector.sel_alternateSelectedControlColor.value;
-public static final long /*int*/ sel_alternateSelectedControlTextColor = Selector.sel_alternateSelectedControlTextColor.value;
-public static final long /*int*/ sel_alwaysShowsDecimalSeparator = Selector.sel_alwaysShowsDecimalSeparator.value;
-public static final long /*int*/ sel_appearanceNamed_ = Selector.sel_appearanceNamed_.value;
-public static final long /*int*/ sel_appendAttributedString_ = Selector.sel_appendAttributedString_.value;
-public static final long /*int*/ sel_appendBezierPath_ = Selector.sel_appendBezierPath_.value;
-public static final long /*int*/ sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_ = Selector.sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_.value;
-public static final long /*int*/ sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_ = Selector.sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_.value;
-public static final long /*int*/ sel_appendBezierPathWithGlyphs_count_inFont_ = Selector.sel_appendBezierPathWithGlyphs_count_inFont_.value;
-public static final long /*int*/ sel_appendBezierPathWithOvalInRect_ = Selector.sel_appendBezierPathWithOvalInRect_.value;
-public static final long /*int*/ sel_appendBezierPathWithRect_ = Selector.sel_appendBezierPathWithRect_.value;
-public static final long /*int*/ sel_appendBezierPathWithRoundedRect_xRadius_yRadius_ = Selector.sel_appendBezierPathWithRoundedRect_xRadius_yRadius_.value;
-public static final long /*int*/ sel_appendString_ = Selector.sel_appendString_.value;
-public static final long /*int*/ sel_application_openFile_ = Selector.sel_application_openFile_.value;
-public static final long /*int*/ sel_application_openFiles_ = Selector.sel_application_openFiles_.value;
-public static final long /*int*/ sel_applicationDidBecomeActive_ = Selector.sel_applicationDidBecomeActive_.value;
-public static final long /*int*/ sel_applicationDidFinishLaunching_ = Selector.sel_applicationDidFinishLaunching_.value;
-public static final long /*int*/ sel_applicationDidResignActive_ = Selector.sel_applicationDidResignActive_.value;
-public static final long /*int*/ sel_applicationDockMenu_ = Selector.sel_applicationDockMenu_.value;
-public static final long /*int*/ sel_applicationIconImage = Selector.sel_applicationIconImage.value;
-public static final long /*int*/ sel_applicationShouldHandleReopen_hasVisibleWindows_ = Selector.sel_applicationShouldHandleReopen_hasVisibleWindows_.value;
-public static final long /*int*/ sel_applicationShouldTerminate_ = Selector.sel_applicationShouldTerminate_.value;
-public static final long /*int*/ sel_applicationWillFinishLaunching_ = Selector.sel_applicationWillFinishLaunching_.value;
-public static final long /*int*/ sel_applicationWillTerminate_ = Selector.sel_applicationWillTerminate_.value;
-public static final long /*int*/ sel_archivedDataWithRootObject_ = Selector.sel_archivedDataWithRootObject_.value;
-public static final long /*int*/ sel_areCursorRectsEnabled = Selector.sel_areCursorRectsEnabled.value;
-public static final long /*int*/ sel_arrangeInFront_ = Selector.sel_arrangeInFront_.value;
-public static final long /*int*/ sel_array = Selector.sel_array.value;
-public static final long /*int*/ sel_arrayWithCapacity_ = Selector.sel_arrayWithCapacity_.value;
-public static final long /*int*/ sel_arrayWithObject_ = Selector.sel_arrayWithObject_.value;
-public static final long /*int*/ sel_arrowCursor = Selector.sel_arrowCursor.value;
-public static final long /*int*/ sel_ascender = Selector.sel_ascender.value;
-public static final long /*int*/ sel_attachColorList_ = Selector.sel_attachColorList_.value;
-public static final long /*int*/ sel_attachment = Selector.sel_attachment.value;
-public static final long /*int*/ sel_attribute_atIndex_effectiveRange_ = Selector.sel_attribute_atIndex_effectiveRange_.value;
-public static final long /*int*/ sel_attributedStringValue = Selector.sel_attributedStringValue.value;
-public static final long /*int*/ sel_attributedStringWithAttachment_ = Selector.sel_attributedStringWithAttachment_.value;
-public static final long /*int*/ sel_attributedSubstringFromRange_ = Selector.sel_attributedSubstringFromRange_.value;
-public static final long /*int*/ sel_attributedTitle = Selector.sel_attributedTitle.value;
-public static final long /*int*/ sel_attributesAtIndex_longestEffectiveRange_inRange_ = Selector.sel_attributesAtIndex_longestEffectiveRange_inRange_.value;
-public static final long /*int*/ sel_autorelease = Selector.sel_autorelease.value;
-public static final long /*int*/ sel_availableFontFamilies = Selector.sel_availableFontFamilies.value;
-public static final long /*int*/ sel_availableFonts = Selector.sel_availableFonts.value;
-public static final long /*int*/ sel_availableMembersOfFontFamily_ = Selector.sel_availableMembersOfFontFamily_.value;
-public static final long /*int*/ sel_availableTypeFromArray_ = Selector.sel_availableTypeFromArray_.value;
-public static final long /*int*/ sel_backgroundColor = Selector.sel_backgroundColor.value;
-public static final long /*int*/ sel_backingScaleFactor = Selector.sel_backingScaleFactor.value;
-public static final long /*int*/ sel_badgeLabel = Selector.sel_badgeLabel.value;
-public static final long /*int*/ sel_baselineOffsetInLayoutManager_glyphIndex_ = Selector.sel_baselineOffsetInLayoutManager_glyphIndex_.value;
-public static final long /*int*/ sel_becomeFirstResponder = Selector.sel_becomeFirstResponder.value;
-public static final long /*int*/ sel_becomeKeyWindow = Selector.sel_becomeKeyWindow.value;
-public static final long /*int*/ sel_beginDocument = Selector.sel_beginDocument.value;
-public static final long /*int*/ sel_beginEditing = Selector.sel_beginEditing.value;
-public static final long /*int*/ sel_beginGestureWithEvent_ = Selector.sel_beginGestureWithEvent_.value;
-public static final long /*int*/ sel_beginPageInRect_atPlacement_ = Selector.sel_beginPageInRect_atPlacement_.value;
-public static final long /*int*/ sel_beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_ = Selector.sel_beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_.value;
-public static final long /*int*/ sel_beginSheetForWindow_modalDelegate_didEndSelector_contextInfo_trust_message_ = Selector.sel_beginSheetForWindow_modalDelegate_didEndSelector_contextInfo_trust_message_.value;
-public static final long /*int*/ sel_beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_ = Selector.sel_beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_.value;
-public static final long /*int*/ sel_beginSheetWithPrintInfo_modalForWindow_delegate_didEndSelector_contextInfo_ = Selector.sel_beginSheetWithPrintInfo_modalForWindow_delegate_didEndSelector_contextInfo_.value;
-public static final long /*int*/ sel_bestRepresentationForDevice_ = Selector.sel_bestRepresentationForDevice_.value;
-public static final long /*int*/ sel_bezelStyle = Selector.sel_bezelStyle.value;
-public static final long /*int*/ sel_bezierPath = Selector.sel_bezierPath.value;
-public static final long /*int*/ sel_bezierPathByFlatteningPath = Selector.sel_bezierPathByFlatteningPath.value;
-public static final long /*int*/ sel_bezierPathWithRect_ = Selector.sel_bezierPathWithRect_.value;
-public static final long /*int*/ sel_bezierPathWithRoundedRect_xRadius_yRadius_ = Selector.sel_bezierPathWithRoundedRect_xRadius_yRadius_.value;
-public static final long /*int*/ sel_bitmapData = Selector.sel_bitmapData.value;
-public static final long /*int*/ sel_bitmapFormat = Selector.sel_bitmapFormat.value;
-public static final long /*int*/ sel_bitmapImageRepForCachingDisplayInRect_ = Selector.sel_bitmapImageRepForCachingDisplayInRect_.value;
-public static final long /*int*/ sel_bitsPerPixel = Selector.sel_bitsPerPixel.value;
-public static final long /*int*/ sel_bitsPerSample = Selector.sel_bitsPerSample.value;
-public static final long /*int*/ sel_blackColor = Selector.sel_blackColor.value;
-public static final long /*int*/ sel_blueComponent = Selector.sel_blueComponent.value;
-public static final long /*int*/ sel_boldSystemFontOfSize_ = Selector.sel_boldSystemFontOfSize_.value;
-public static final long /*int*/ sel_boolValue = Selector.sel_boolValue.value;
-public static final long /*int*/ sel_borderWidth = Selector.sel_borderWidth.value;
-public static final long /*int*/ sel_boundingRectForGlyphRange_inTextContainer_ = Selector.sel_boundingRectForGlyphRange_inTextContainer_.value;
-public static final long /*int*/ sel_boundingRectWithSize_options_ = Selector.sel_boundingRectWithSize_options_.value;
-public static final long /*int*/ sel_bounds = Selector.sel_bounds.value;
-public static final long /*int*/ sel_bundleIdentifier = Selector.sel_bundleIdentifier.value;
-public static final long /*int*/ sel_bundlePath = Selector.sel_bundlePath.value;
-public static final long /*int*/ sel_bundleWithIdentifier_ = Selector.sel_bundleWithIdentifier_.value;
-public static final long /*int*/ sel_bundleWithPath_ = Selector.sel_bundleWithPath_.value;
-public static final long /*int*/ sel_button = Selector.sel_button.value;
-public static final long /*int*/ sel_buttonNumber = Selector.sel_buttonNumber.value;
-public static final long /*int*/ sel_bytes = Selector.sel_bytes.value;
-public static final long /*int*/ sel_bytesPerPlane = Selector.sel_bytesPerPlane.value;
-public static final long /*int*/ sel_bytesPerRow = Selector.sel_bytesPerRow.value;
-public static final long /*int*/ sel_cacheDisplayInRect_toBitmapImageRep_ = Selector.sel_cacheDisplayInRect_toBitmapImageRep_.value;
-public static final long /*int*/ sel_calendarDate = Selector.sel_calendarDate.value;
-public static final long /*int*/ sel_canBecomeKeyView = Selector.sel_canBecomeKeyView.value;
-public static final long /*int*/ sel_canBecomeKeyWindow = Selector.sel_canBecomeKeyWindow.value;
-public static final long /*int*/ sel_canDragRowsWithIndexes_atPoint_ = Selector.sel_canDragRowsWithIndexes_atPoint_.value;
-public static final long /*int*/ sel_canGoBack = Selector.sel_canGoBack.value;
-public static final long /*int*/ sel_canGoForward = Selector.sel_canGoForward.value;
-public static final long /*int*/ sel_canRedo = Selector.sel_canRedo.value;
-public static final long /*int*/ sel_canShowMIMEType_ = Selector.sel_canShowMIMEType_.value;
-public static final long /*int*/ sel_canUndo = Selector.sel_canUndo.value;
-public static final long /*int*/ sel_cancel = Selector.sel_cancel.value;
-public static final long /*int*/ sel_cancelAuthenticationChallenge_ = Selector.sel_cancelAuthenticationChallenge_.value;
-public static final long /*int*/ sel_cancelButtonCell = Selector.sel_cancelButtonCell.value;
-public static final long /*int*/ sel_cancelButtonRectForBounds_ = Selector.sel_cancelButtonRectForBounds_.value;
-public static final long /*int*/ sel_cancelOperation_ = Selector.sel_cancelOperation_.value;
-public static final long /*int*/ sel_cancelTracking = Selector.sel_cancelTracking.value;
-public static final long /*int*/ sel_cascadeTopLeftFromPoint_ = Selector.sel_cascadeTopLeftFromPoint_.value;
-public static final long /*int*/ sel_cell = Selector.sel_cell.value;
-public static final long /*int*/ sel_cellClass = Selector.sel_cellClass.value;
-public static final long /*int*/ sel_cellSize = Selector.sel_cellSize.value;
-public static final long /*int*/ sel_cellSizeForBounds_ = Selector.sel_cellSizeForBounds_.value;
-public static final long /*int*/ sel_changeColor_ = Selector.sel_changeColor_.value;
-public static final long /*int*/ sel_changeFont_ = Selector.sel_changeFont_.value;
-public static final long /*int*/ sel_charCode = Selector.sel_charCode.value;
-public static final long /*int*/ sel_characterAtIndex_ = Selector.sel_characterAtIndex_.value;
-public static final long /*int*/ sel_characterIndexForGlyphAtIndex_ = Selector.sel_characterIndexForGlyphAtIndex_.value;
-public static final long /*int*/ sel_characterIndexForInsertionAtPoint_ = Selector.sel_characterIndexForInsertionAtPoint_.value;
-public static final long /*int*/ sel_characterIndexForPoint_ = Selector.sel_characterIndexForPoint_.value;
-public static final long /*int*/ sel_characterIsMember_ = Selector.sel_characterIsMember_.value;
-public static final long /*int*/ sel_characters = Selector.sel_characters.value;
-public static final long /*int*/ sel_charactersIgnoringModifiers = Selector.sel_charactersIgnoringModifiers.value;
-public static final long /*int*/ sel_chooseFilename_ = Selector.sel_chooseFilename_.value;
-public static final long /*int*/ sel_className = Selector.sel_className.value;
-public static final long /*int*/ sel_cleanUpOperation = Selector.sel_cleanUpOperation.value;
-public static final long /*int*/ sel_clearColor = Selector.sel_clearColor.value;
-public static final long /*int*/ sel_clearCurrentContext = Selector.sel_clearCurrentContext.value;
-public static final long /*int*/ sel_clearDrawable = Selector.sel_clearDrawable.value;
-public static final long /*int*/ sel_clickCount = Selector.sel_clickCount.value;
-public static final long /*int*/ sel_clickedColumn = Selector.sel_clickedColumn.value;
-public static final long /*int*/ sel_clickedRow = Selector.sel_clickedRow.value;
-public static final long /*int*/ sel_close = Selector.sel_close.value;
-public static final long /*int*/ sel_closePath = Selector.sel_closePath.value;
-public static final long /*int*/ sel_code = Selector.sel_code.value;
-public static final long /*int*/ sel_collapseItem_ = Selector.sel_collapseItem_.value;
-public static final long /*int*/ sel_collapseItem_collapseChildren_ = Selector.sel_collapseItem_collapseChildren_.value;
-public static final long /*int*/ sel_collectionBehavior = Selector.sel_collectionBehavior.value;
-public static final long /*int*/ sel_color = Selector.sel_color.value;
-public static final long /*int*/ sel_colorAtX_y_ = Selector.sel_colorAtX_y_.value;
-public static final long /*int*/ sel_colorListNamed_ = Selector.sel_colorListNamed_.value;
-public static final long /*int*/ sel_colorSpace = Selector.sel_colorSpace.value;
-public static final long /*int*/ sel_colorSpaceModel = Selector.sel_colorSpaceModel.value;
-public static final long /*int*/ sel_colorSpaceName = Selector.sel_colorSpaceName.value;
-public static final long /*int*/ sel_colorUsingColorSpaceName_ = Selector.sel_colorUsingColorSpaceName_.value;
-public static final long /*int*/ sel_colorWithCalibratedRed_green_blue_alpha_ = Selector.sel_colorWithCalibratedRed_green_blue_alpha_.value;
-public static final long /*int*/ sel_colorWithDeviceRed_green_blue_alpha_ = Selector.sel_colorWithDeviceRed_green_blue_alpha_.value;
-public static final long /*int*/ sel_colorWithKey_ = Selector.sel_colorWithKey_.value;
-public static final long /*int*/ sel_colorWithPatternImage_ = Selector.sel_colorWithPatternImage_.value;
-public static final long /*int*/ sel_columnAtPoint_ = Selector.sel_columnAtPoint_.value;
-public static final long /*int*/ sel_columnIndexesInRect_ = Selector.sel_columnIndexesInRect_.value;
-public static final long /*int*/ sel_columnWithIdentifier_ = Selector.sel_columnWithIdentifier_.value;
-public static final long /*int*/ sel_comboBoxSelectionDidChange_ = Selector.sel_comboBoxSelectionDidChange_.value;
-public static final long /*int*/ sel_comboBoxWillDismiss_ = Selector.sel_comboBoxWillDismiss_.value;
-public static final long /*int*/ sel_comboBoxWillPopUp_ = Selector.sel_comboBoxWillPopUp_.value;
-public static final long /*int*/ sel_compare_ = Selector.sel_compare_.value;
-public static final long /*int*/ sel_concat = Selector.sel_concat.value;
-public static final long /*int*/ sel_conformsToProtocol_ = Selector.sel_conformsToProtocol_.value;
-public static final long /*int*/ sel_containerSize = Selector.sel_containerSize.value;
-public static final long /*int*/ sel_containsIndex_ = Selector.sel_containsIndex_.value;
-public static final long /*int*/ sel_containsObject_ = Selector.sel_containsObject_.value;
-public static final long /*int*/ sel_containsPoint_ = Selector.sel_containsPoint_.value;
-public static final long /*int*/ sel_contentRect = Selector.sel_contentRect.value;
-public static final long /*int*/ sel_contentSize = Selector.sel_contentSize.value;
-public static final long /*int*/ sel_contentSizeForFrameSize_hasHorizontalScroller_hasVerticalScroller_borderType_ = Selector.sel_contentSizeForFrameSize_hasHorizontalScroller_hasVerticalScroller_borderType_.value;
-public static final long /*int*/ sel_contentView = Selector.sel_contentView.value;
-public static final long /*int*/ sel_contentViewMargins = Selector.sel_contentViewMargins.value;
-public static final long /*int*/ sel_context = Selector.sel_context.value;
-public static final long /*int*/ sel_controlBackgroundColor = Selector.sel_controlBackgroundColor.value;
-public static final long /*int*/ sel_controlContentFontOfSize_ = Selector.sel_controlContentFontOfSize_.value;
-public static final long /*int*/ sel_controlDarkShadowColor = Selector.sel_controlDarkShadowColor.value;
-public static final long /*int*/ sel_controlHighlightColor = Selector.sel_controlHighlightColor.value;
-public static final long /*int*/ sel_controlLightHighlightColor = Selector.sel_controlLightHighlightColor.value;
-public static final long /*int*/ sel_controlPointBounds = Selector.sel_controlPointBounds.value;
-public static final long /*int*/ sel_controlShadowColor = Selector.sel_controlShadowColor.value;
-public static final long /*int*/ sel_controlSize = Selector.sel_controlSize.value;
-public static final long /*int*/ sel_controlTextColor = Selector.sel_controlTextColor.value;
-public static final long /*int*/ sel_convertBaseToScreen_ = Selector.sel_convertBaseToScreen_.value;
-public static final long /*int*/ sel_convertFont_toHaveTrait_ = Selector.sel_convertFont_toHaveTrait_.value;
-public static final long /*int*/ sel_convertPoint_fromView_ = Selector.sel_convertPoint_fromView_.value;
-public static final long /*int*/ sel_convertPoint_toView_ = Selector.sel_convertPoint_toView_.value;
-public static final long /*int*/ sel_convertPointFromBase_ = Selector.sel_convertPointFromBase_.value;
-public static final long /*int*/ sel_convertPointToBase_ = Selector.sel_convertPointToBase_.value;
-public static final long /*int*/ sel_convertRect_fromView_ = Selector.sel_convertRect_fromView_.value;
-public static final long /*int*/ sel_convertRect_toView_ = Selector.sel_convertRect_toView_.value;
-public static final long /*int*/ sel_convertRectFromBase_ = Selector.sel_convertRectFromBase_.value;
-public static final long /*int*/ sel_convertRectToBase_ = Selector.sel_convertRectToBase_.value;
-public static final long /*int*/ sel_convertScreenToBase_ = Selector.sel_convertScreenToBase_.value;
-public static final long /*int*/ sel_convertSize_fromView_ = Selector.sel_convertSize_fromView_.value;
-public static final long /*int*/ sel_convertSize_toView_ = Selector.sel_convertSize_toView_.value;
-public static final long /*int*/ sel_convertSizeFromBase_ = Selector.sel_convertSizeFromBase_.value;
-public static final long /*int*/ sel_convertSizeToBase_ = Selector.sel_convertSizeToBase_.value;
-public static final long /*int*/ sel_cookies = Selector.sel_cookies.value;
-public static final long /*int*/ sel_cookiesForURL_ = Selector.sel_cookiesForURL_.value;
-public static final long /*int*/ sel_cookiesWithResponseHeaderFields_forURL_ = Selector.sel_cookiesWithResponseHeaderFields_forURL_.value;
-public static final long /*int*/ sel_copiesOnScroll = Selector.sel_copiesOnScroll.value;
-public static final long /*int*/ sel_copy = Selector.sel_copy.value;
-public static final long /*int*/ sel_copy_ = Selector.sel_copy_.value;
-public static final long /*int*/ sel_count = Selector.sel_count.value;
-public static final long /*int*/ sel_createContext = Selector.sel_createContext.value;
-public static final long /*int*/ sel_createFileAtPath_contents_attributes_ = Selector.sel_createFileAtPath_contents_attributes_.value;
-public static final long /*int*/ sel_credentialWithUser_password_persistence_ = Selector.sel_credentialWithUser_password_persistence_.value;
-public static final long /*int*/ sel_crosshairCursor = Selector.sel_crosshairCursor.value;
-public static final long /*int*/ sel_ctrlKey = Selector.sel_ctrlKey.value;
-public static final long /*int*/ sel_currentAppearance = Selector.sel_currentAppearance.value;
-public static final long /*int*/ sel_currentApplication = Selector.sel_currentApplication.value;
-public static final long /*int*/ sel_currentContext = Selector.sel_currentContext.value;
-public static final long /*int*/ sel_currentCursor = Selector.sel_currentCursor.value;
-public static final long /*int*/ sel_currentEditor = Selector.sel_currentEditor.value;
-public static final long /*int*/ sel_currentEvent = Selector.sel_currentEvent.value;
-public static final long /*int*/ sel_currentInputManager = Selector.sel_currentInputManager.value;
-public static final long /*int*/ sel_currentPoint = Selector.sel_currentPoint.value;
-public static final long /*int*/ sel_currentRunLoop = Selector.sel_currentRunLoop.value;
-public static final long /*int*/ sel_currentThread = Selector.sel_currentThread.value;
-public static final long /*int*/ sel_cursorUpdate_ = Selector.sel_cursorUpdate_.value;
-public static final long /*int*/ sel_curveToPoint_controlPoint1_controlPoint2_ = Selector.sel_curveToPoint_controlPoint1_controlPoint2_.value;
-public static final long /*int*/ sel_cut_ = Selector.sel_cut_.value;
-public static final long /*int*/ sel_dataCell = Selector.sel_dataCell.value;
-public static final long /*int*/ sel_dataForType_ = Selector.sel_dataForType_.value;
-public static final long /*int*/ sel_dataSource = Selector.sel_dataSource.value;
-public static final long /*int*/ sel_dataWithBytes_length_ = Selector.sel_dataWithBytes_length_.value;
-public static final long /*int*/ sel_dateValue = Selector.sel_dateValue.value;
-public static final long /*int*/ sel_dateWithCalendarFormat_timeZone_ = Selector.sel_dateWithCalendarFormat_timeZone_.value;
-public static final long /*int*/ sel_dateWithTimeIntervalSinceNow_ = Selector.sel_dateWithTimeIntervalSinceNow_.value;
-public static final long /*int*/ sel_dateWithYear_month_day_hour_minute_second_timeZone_ = Selector.sel_dateWithYear_month_day_hour_minute_second_timeZone_.value;
-public static final long /*int*/ sel_dayOfMonth = Selector.sel_dayOfMonth.value;
-public static final long /*int*/ sel_dealloc = Selector.sel_dealloc.value;
-public static final long /*int*/ sel_decimalDigitCharacterSet = Selector.sel_decimalDigitCharacterSet.value;
-public static final long /*int*/ sel_decimalSeparator = Selector.sel_decimalSeparator.value;
-public static final long /*int*/ sel_declareTypes_owner_ = Selector.sel_declareTypes_owner_.value;
-public static final long /*int*/ sel_defaultBaselineOffsetForFont_ = Selector.sel_defaultBaselineOffsetForFont_.value;
-public static final long /*int*/ sel_defaultButtonCell = Selector.sel_defaultButtonCell.value;
-public static final long /*int*/ sel_defaultCenter = Selector.sel_defaultCenter.value;
-public static final long /*int*/ sel_defaultFlatness = Selector.sel_defaultFlatness.value;
-public static final long /*int*/ sel_defaultLineHeightForFont_ = Selector.sel_defaultLineHeightForFont_.value;
-public static final long /*int*/ sel_defaultManager = Selector.sel_defaultManager.value;
-public static final long /*int*/ sel_defaultParagraphStyle = Selector.sel_defaultParagraphStyle.value;
-public static final long /*int*/ sel_defaultPrinter = Selector.sel_defaultPrinter.value;
-public static final long /*int*/ sel_defaultTimeZone = Selector.sel_defaultTimeZone.value;
-public static final long /*int*/ sel_delegate = Selector.sel_delegate.value;
-public static final long /*int*/ sel_deleteCookie_ = Selector.sel_deleteCookie_.value;
-public static final long /*int*/ sel_deliverResult = Selector.sel_deliverResult.value;
-public static final long /*int*/ sel_deltaX = Selector.sel_deltaX.value;
-public static final long /*int*/ sel_deltaY = Selector.sel_deltaY.value;
-public static final long /*int*/ sel_deminiaturize_ = Selector.sel_deminiaturize_.value;
-public static final long /*int*/ sel_depth = Selector.sel_depth.value;
-public static final long /*int*/ sel_descender = Selector.sel_descender.value;
-public static final long /*int*/ sel_description = Selector.sel_description.value;
-public static final long /*int*/ sel_deselectAll_ = Selector.sel_deselectAll_.value;
-public static final long /*int*/ sel_deselectItemAtIndex_ = Selector.sel_deselectItemAtIndex_.value;
-public static final long /*int*/ sel_deselectRow_ = Selector.sel_deselectRow_.value;
-public static final long /*int*/ sel_destroyContext = Selector.sel_destroyContext.value;
-public static final long /*int*/ sel_detail = Selector.sel_detail.value;
-public static final long /*int*/ sel_device = Selector.sel_device.value;
-public static final long /*int*/ sel_deviceDescription = Selector.sel_deviceDescription.value;
-public static final long /*int*/ sel_deviceSize = Selector.sel_deviceSize.value;
-public static final long /*int*/ sel_dictionary = Selector.sel_dictionary.value;
-public static final long /*int*/ sel_dictionaryWithCapacity_ = Selector.sel_dictionaryWithCapacity_.value;
-public static final long /*int*/ sel_dictionaryWithObject_forKey_ = Selector.sel_dictionaryWithObject_forKey_.value;
-public static final long /*int*/ sel_disableCursorRects = Selector.sel_disableCursorRects.value;
-public static final long /*int*/ sel_disableFlushWindow = Selector.sel_disableFlushWindow.value;
-public static final long /*int*/ sel_disabledControlTextColor = Selector.sel_disabledControlTextColor.value;
-public static final long /*int*/ sel_discardCursorRects = Selector.sel_discardCursorRects.value;
-public static final long /*int*/ sel_display = Selector.sel_display.value;
-public static final long /*int*/ sel_displayIfNeeded = Selector.sel_displayIfNeeded.value;
-public static final long /*int*/ sel_displayName = Selector.sel_displayName.value;
-public static final long /*int*/ sel_displayNameForKey_value_ = Selector.sel_displayNameForKey_value_.value;
-public static final long /*int*/ sel_displayRectIgnoringOpacity_inContext_ = Selector.sel_displayRectIgnoringOpacity_inContext_.value;
-public static final long /*int*/ sel_distantFuture = Selector.sel_distantFuture.value;
-public static final long /*int*/ sel_doCommandBySelector_ = Selector.sel_doCommandBySelector_.value;
-public static final long /*int*/ sel_dockTile = Selector.sel_dockTile.value;
-public static final long /*int*/ sel_documentCursor = Selector.sel_documentCursor.value;
-public static final long /*int*/ sel_documentSource = Selector.sel_documentSource.value;
-public static final long /*int*/ sel_documentView = Selector.sel_documentView.value;
-public static final long /*int*/ sel_documentViewShouldHandlePrint = Selector.sel_documentViewShouldHandlePrint.value;
-public static final long /*int*/ sel_documentVisibleRect = Selector.sel_documentVisibleRect.value;
-public static final long /*int*/ sel_doubleClickAtIndex_ = Selector.sel_doubleClickAtIndex_.value;
-public static final long /*int*/ sel_doubleValue = Selector.sel_doubleValue.value;
-public static final long /*int*/ sel_download = Selector.sel_download.value;
-public static final long /*int*/ sel_download_decideDestinationWithSuggestedFilename_ = Selector.sel_download_decideDestinationWithSuggestedFilename_.value;
-public static final long /*int*/ sel_dragImage_at_offset_event_pasteboard_source_slideBack_ = Selector.sel_dragImage_at_offset_event_pasteboard_source_slideBack_.value;
-public static final long /*int*/ sel_dragImageForRowsWithIndexes_tableColumns_event_offset_ = Selector.sel_dragImageForRowsWithIndexes_tableColumns_event_offset_.value;
-public static final long /*int*/ sel_dragSelectionWithEvent_offset_slideBack_ = Selector.sel_dragSelectionWithEvent_offset_slideBack_.value;
-public static final long /*int*/ sel_draggedImage_beganAt_ = Selector.sel_draggedImage_beganAt_.value;
-public static final long /*int*/ sel_draggedImage_endedAt_operation_ = Selector.sel_draggedImage_endedAt_operation_.value;
-public static final long /*int*/ sel_draggingDestinationWindow = Selector.sel_draggingDestinationWindow.value;
-public static final long /*int*/ sel_draggingEnded_ = Selector.sel_draggingEnded_.value;
-public static final long /*int*/ sel_draggingEntered_ = Selector.sel_draggingEntered_.value;
-public static final long /*int*/ sel_draggingExited_ = Selector.sel_draggingExited_.value;
-public static final long /*int*/ sel_draggingLocation = Selector.sel_draggingLocation.value;
-public static final long /*int*/ sel_draggingPasteboard = Selector.sel_draggingPasteboard.value;
-public static final long /*int*/ sel_draggingSourceOperationMask = Selector.sel_draggingSourceOperationMask.value;
-public static final long /*int*/ sel_draggingSourceOperationMaskForLocal_ = Selector.sel_draggingSourceOperationMaskForLocal_.value;
-public static final long /*int*/ sel_draggingUpdated_ = Selector.sel_draggingUpdated_.value;
-public static final long /*int*/ sel_drawAtPoint_ = Selector.sel_drawAtPoint_.value;
-public static final long /*int*/ sel_drawAtPoint_fromRect_operation_fraction_ = Selector.sel_drawAtPoint_fromRect_operation_fraction_.value;
-public static final long /*int*/ sel_drawBackgroundForGlyphRange_atPoint_ = Selector.sel_drawBackgroundForGlyphRange_atPoint_.value;
-public static final long /*int*/ sel_drawBackgroundInClipRect_ = Selector.sel_drawBackgroundInClipRect_.value;
-public static final long /*int*/ sel_drawBezelWithFrame_inView_ = Selector.sel_drawBezelWithFrame_inView_.value;
-public static final long /*int*/ sel_drawFromPoint_toPoint_options_ = Selector.sel_drawFromPoint_toPoint_options_.value;
-public static final long /*int*/ sel_drawGlyphsForGlyphRange_atPoint_ = Selector.sel_drawGlyphsForGlyphRange_atPoint_.value;
-public static final long /*int*/ sel_drawImage_withFrame_inView_ = Selector.sel_drawImage_withFrame_inView_.value;
-public static final long /*int*/ sel_drawInBezierPath_angle_ = Selector.sel_drawInBezierPath_angle_.value;
-public static final long /*int*/ sel_drawInRect_ = Selector.sel_drawInRect_.value;
-public static final long /*int*/ sel_drawInRect_angle_ = Selector.sel_drawInRect_angle_.value;
-public static final long /*int*/ sel_drawInRect_fromRect_operation_fraction_ = Selector.sel_drawInRect_fromRect_operation_fraction_.value;
-public static final long /*int*/ sel_drawInteriorWithFrame_inView_ = Selector.sel_drawInteriorWithFrame_inView_.value;
-public static final long /*int*/ sel_drawLabel_inRect_ = Selector.sel_drawLabel_inRect_.value;
-public static final long /*int*/ sel_drawRect_ = Selector.sel_drawRect_.value;
-public static final long /*int*/ sel_drawSortIndicatorWithFrame_inView_ascending_priority_ = Selector.sel_drawSortIndicatorWithFrame_inView_ascending_priority_.value;
-public static final long /*int*/ sel_drawStatusBarBackgroundInRect_withHighlight_ = Selector.sel_drawStatusBarBackgroundInRect_withHighlight_.value;
-public static final long /*int*/ sel_drawTitle_withFrame_inView_ = Selector.sel_drawTitle_withFrame_inView_.value;
-public static final long /*int*/ sel_drawViewBackgroundInRect_ = Selector.sel_drawViewBackgroundInRect_.value;
-public static final long /*int*/ sel_drawWithExpansionFrame_inView_ = Selector.sel_drawWithExpansionFrame_inView_.value;
-public static final long /*int*/ sel_drawingRectForBounds_ = Selector.sel_drawingRectForBounds_.value;
-public static final long /*int*/ sel_elementAtIndex_associatedPoints_ = Selector.sel_elementAtIndex_associatedPoints_.value;
-public static final long /*int*/ sel_elementCount = Selector.sel_elementCount.value;
-public static final long /*int*/ sel_enableCursorRects = Selector.sel_enableCursorRects.value;
-public static final long /*int*/ sel_enableFlushWindow = Selector.sel_enableFlushWindow.value;
-public static final long /*int*/ sel_endDocument = Selector.sel_endDocument.value;
-public static final long /*int*/ sel_endEditing = Selector.sel_endEditing.value;
-public static final long /*int*/ sel_endEditingFor_ = Selector.sel_endEditingFor_.value;
-public static final long /*int*/ sel_endGestureWithEvent_ = Selector.sel_endGestureWithEvent_.value;
-public static final long /*int*/ sel_endPage = Selector.sel_endPage.value;
-public static final long /*int*/ sel_endSheet_returnCode_ = Selector.sel_endSheet_returnCode_.value;
-public static final long /*int*/ sel_enterExitEventWithType_location_modifierFlags_timestamp_windowNumber_context_eventNumber_trackingNumber_userData_ = Selector.sel_enterExitEventWithType_location_modifierFlags_timestamp_windowNumber_context_eventNumber_trackingNumber_userData_.value;
-public static final long /*int*/ sel_enumeratorAtPath_ = Selector.sel_enumeratorAtPath_.value;
-public static final long /*int*/ sel_expandItem_ = Selector.sel_expandItem_.value;
-public static final long /*int*/ sel_expandItem_expandChildren_ = Selector.sel_expandItem_expandChildren_.value;
-public static final long /*int*/ sel_expansionFrameWithFrame_inView_ = Selector.sel_expansionFrameWithFrame_inView_.value;
-public static final long /*int*/ sel_familyName = Selector.sel_familyName.value;
-public static final long /*int*/ sel_fieldEditor_forObject_ = Selector.sel_fieldEditor_forObject_.value;
-public static final long /*int*/ sel_fileExistsAtPath_ = Selector.sel_fileExistsAtPath_.value;
-public static final long /*int*/ sel_fileExistsAtPath_isDirectory_ = Selector.sel_fileExistsAtPath_isDirectory_.value;
-public static final long /*int*/ sel_fileSystemRepresentation = Selector.sel_fileSystemRepresentation.value;
-public static final long /*int*/ sel_fileURLWithPath_ = Selector.sel_fileURLWithPath_.value;
-public static final long /*int*/ sel_filename = Selector.sel_filename.value;
-public static final long /*int*/ sel_filenames = Selector.sel_filenames.value;
-public static final long /*int*/ sel_fill = Selector.sel_fill.value;
-public static final long /*int*/ sel_fillRect_ = Selector.sel_fillRect_.value;
-public static final long /*int*/ sel_finishLaunching = Selector.sel_finishLaunching.value;
-public static final long /*int*/ sel_firstIndex = Selector.sel_firstIndex.value;
-public static final long /*int*/ sel_firstRectForCharacterRange_ = Selector.sel_firstRectForCharacterRange_.value;
-public static final long /*int*/ sel_firstResponder = Selector.sel_firstResponder.value;
-public static final long /*int*/ sel_flagsChanged_ = Selector.sel_flagsChanged_.value;
-public static final long /*int*/ sel_floatValue = Selector.sel_floatValue.value;
-public static final long /*int*/ sel_flushBuffer = Selector.sel_flushBuffer.value;
-public static final long /*int*/ sel_flushGraphics = Selector.sel_flushGraphics.value;
-public static final long /*int*/ sel_flushWindowIfNeeded = Selector.sel_flushWindowIfNeeded.value;
-public static final long /*int*/ sel_focusRingMaskBoundsForFrame_inView_ = Selector.sel_focusRingMaskBoundsForFrame_inView_.value;
-public static final long /*int*/ sel_font = Selector.sel_font.value;
-public static final long /*int*/ sel_fontName = Selector.sel_fontName.value;
-public static final long /*int*/ sel_fontWithFamily_traits_weight_size_ = Selector.sel_fontWithFamily_traits_weight_size_.value;
-public static final long /*int*/ sel_fontWithName_size_ = Selector.sel_fontWithName_size_.value;
-public static final long /*int*/ sel_frame = Selector.sel_frame.value;
-public static final long /*int*/ sel_frameOfCellAtColumn_row_ = Selector.sel_frameOfCellAtColumn_row_.value;
-public static final long /*int*/ sel_frameOfOutlineCellAtRow_ = Selector.sel_frameOfOutlineCellAtRow_.value;
-public static final long /*int*/ sel_frameRectForContentRect_ = Selector.sel_frameRectForContentRect_.value;
-public static final long /*int*/ sel_frameSizeForContentSize_hasHorizontalScroller_hasVerticalScroller_borderType_ = Selector.sel_frameSizeForContentSize_hasHorizontalScroller_hasVerticalScroller_borderType_.value;
-public static final long /*int*/ sel_fullPathForApplication_ = Selector.sel_fullPathForApplication_.value;
-public static final long /*int*/ sel_generalPasteboard = Selector.sel_generalPasteboard.value;
-public static final long /*int*/ sel_genericRGBColorSpace = Selector.sel_genericRGBColorSpace.value;
-public static final long /*int*/ sel_getBitmapDataPlanes_ = Selector.sel_getBitmapDataPlanes_.value;
-public static final long /*int*/ sel_getBytes_ = Selector.sel_getBytes_.value;
-public static final long /*int*/ sel_getBytes_length_ = Selector.sel_getBytes_length_.value;
-public static final long /*int*/ sel_getCharacters_ = Selector.sel_getCharacters_.value;
-public static final long /*int*/ sel_getCharacters_range_ = Selector.sel_getCharacters_range_.value;
-public static final long /*int*/ sel_getComponents_ = Selector.sel_getComponents_.value;
-public static final long /*int*/ sel_getGlyphs_range_ = Selector.sel_getGlyphs_range_.value;
-public static final long /*int*/ sel_getGlyphsInRange_glyphs_characterIndexes_glyphInscriptions_elasticBits_bidiLevels_ = Selector.sel_getGlyphsInRange_glyphs_characterIndexes_glyphInscriptions_elasticBits_bidiLevels_.value;
-public static final long /*int*/ sel_getIndexes_maxCount_inIndexRange_ = Selector.sel_getIndexes_maxCount_inIndexRange_.value;
-public static final long /*int*/ sel_getInfoForFile_application_type_ = Selector.sel_getInfoForFile_application_type_.value;
-public static final long /*int*/ sel_getValues_forAttribute_forVirtualScreen_ = Selector.sel_getValues_forAttribute_forVirtualScreen_.value;
-public static final long /*int*/ sel_globalContext = Selector.sel_globalContext.value;
-public static final long /*int*/ sel_glyphIndexForCharacterAtIndex_ = Selector.sel_glyphIndexForCharacterAtIndex_.value;
-public static final long /*int*/ sel_glyphIndexForPoint_inTextContainer_fractionOfDistanceThroughGlyph_ = Selector.sel_glyphIndexForPoint_inTextContainer_fractionOfDistanceThroughGlyph_.value;
-public static final long /*int*/ sel_glyphRangeForCharacterRange_actualCharacterRange_ = Selector.sel_glyphRangeForCharacterRange_actualCharacterRange_.value;
-public static final long /*int*/ sel_glyphRangeForTextContainer_ = Selector.sel_glyphRangeForTextContainer_.value;
-public static final long /*int*/ sel_goBack = Selector.sel_goBack.value;
-public static final long /*int*/ sel_goForward = Selector.sel_goForward.value;
-public static final long /*int*/ sel_graphicsContext = Selector.sel_graphicsContext.value;
-public static final long /*int*/ sel_graphicsContextWithBitmapImageRep_ = Selector.sel_graphicsContextWithBitmapImageRep_.value;
-public static final long /*int*/ sel_graphicsContextWithGraphicsPort_flipped_ = Selector.sel_graphicsContextWithGraphicsPort_flipped_.value;
-public static final long /*int*/ sel_graphicsContextWithWindow_ = Selector.sel_graphicsContextWithWindow_.value;
-public static final long /*int*/ sel_graphicsPort = Selector.sel_graphicsPort.value;
-public static final long /*int*/ sel_greenComponent = Selector.sel_greenComponent.value;
-public static final long /*int*/ sel_handleEvent_ = Selector.sel_handleEvent_.value;
-public static final long /*int*/ sel_handleMouseEvent_ = Selector.sel_handleMouseEvent_.value;
-public static final long /*int*/ sel_hasAlpha = Selector.sel_hasAlpha.value;
-public static final long /*int*/ sel_hasMarkedText = Selector.sel_hasMarkedText.value;
-public static final long /*int*/ sel_hasPassword = Selector.sel_hasPassword.value;
-public static final long /*int*/ sel_hasShadow = Selector.sel_hasShadow.value;
-public static final long /*int*/ sel_headerCell = Selector.sel_headerCell.value;
-public static final long /*int*/ sel_headerRectOfColumn_ = Selector.sel_headerRectOfColumn_.value;
-public static final long /*int*/ sel_headerView = Selector.sel_headerView.value;
-public static final long /*int*/ sel_helpRequested_ = Selector.sel_helpRequested_.value;
-public static final long /*int*/ sel_hide_ = Selector.sel_hide_.value;
-public static final long /*int*/ sel_hideOtherApplications_ = Selector.sel_hideOtherApplications_.value;
-public static final long /*int*/ sel_highlightColorInView_ = Selector.sel_highlightColorInView_.value;
-public static final long /*int*/ sel_highlightColorWithFrame_inView_ = Selector.sel_highlightColorWithFrame_inView_.value;
-public static final long /*int*/ sel_highlightSelectionInClipRect_ = Selector.sel_highlightSelectionInClipRect_.value;
-public static final long /*int*/ sel_hitPart = Selector.sel_hitPart.value;
-public static final long /*int*/ sel_hitTest_ = Selector.sel_hitTest_.value;
-public static final long /*int*/ sel_hitTestForEvent_inRect_ofView_ = Selector.sel_hitTestForEvent_inRect_ofView_.value;
-public static final long /*int*/ sel_host = Selector.sel_host.value;
-public static final long /*int*/ sel_hotSpot = Selector.sel_hotSpot.value;
-public static final long /*int*/ sel_hourOfDay = Selector.sel_hourOfDay.value;
-public static final long /*int*/ sel_iconForFile_ = Selector.sel_iconForFile_.value;
-public static final long /*int*/ sel_iconForFileType_ = Selector.sel_iconForFileType_.value;
-public static final long /*int*/ sel_ignore = Selector.sel_ignore.value;
-public static final long /*int*/ sel_ignoreModifierKeysWhileDragging = Selector.sel_ignoreModifierKeysWhileDragging.value;
-public static final long /*int*/ sel_image = Selector.sel_image.value;
-public static final long /*int*/ sel_imageInterpolation = Selector.sel_imageInterpolation.value;
-public static final long /*int*/ sel_imageNamed_ = Selector.sel_imageNamed_.value;
-public static final long /*int*/ sel_imageRectForBounds_ = Selector.sel_imageRectForBounds_.value;
-public static final long /*int*/ sel_imageRepWithContentsOfFile_ = Selector.sel_imageRepWithContentsOfFile_.value;
-public static final long /*int*/ sel_imageRepWithData_ = Selector.sel_imageRepWithData_.value;
-public static final long /*int*/ sel_imageablePageBounds = Selector.sel_imageablePageBounds.value;
-public static final long /*int*/ sel_increment = Selector.sel_increment.value;
-public static final long /*int*/ sel_indentationPerLevel = Selector.sel_indentationPerLevel.value;
-public static final long /*int*/ sel_indexOfItemWithTarget_andAction_ = Selector.sel_indexOfItemWithTarget_andAction_.value;
-public static final long /*int*/ sel_indexOfObjectIdenticalTo_ = Selector.sel_indexOfObjectIdenticalTo_.value;
-public static final long /*int*/ sel_indexOfSelectedItem = Selector.sel_indexOfSelectedItem.value;
-public static final long /*int*/ sel_indexSetWithIndex_ = Selector.sel_indexSetWithIndex_.value;
-public static final long /*int*/ sel_infoDictionary = Selector.sel_infoDictionary.value;
-public static final long /*int*/ sel_init = Selector.sel_init.value;
-public static final long /*int*/ sel_initByReferencingFile_ = Selector.sel_initByReferencingFile_.value;
-public static final long /*int*/ sel_initListDescriptor = Selector.sel_initListDescriptor.value;
-public static final long /*int*/ sel_initWithAttributes_ = Selector.sel_initWithAttributes_.value;
-public static final long /*int*/ sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_ = Selector.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_.value;
-public static final long /*int*/ sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_ = Selector.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_.value;
-public static final long /*int*/ sel_initWithCapacity_ = Selector.sel_initWithCapacity_.value;
-public static final long /*int*/ sel_initWithCharacters_length_ = Selector.sel_initWithCharacters_length_.value;
-public static final long /*int*/ sel_initWithColors_ = Selector.sel_initWithColors_.value;
-public static final long /*int*/ sel_initWithContainerSize_ = Selector.sel_initWithContainerSize_.value;
-public static final long /*int*/ sel_initWithContentRect_styleMask_backing_defer_ = Selector.sel_initWithContentRect_styleMask_backing_defer_.value;
-public static final long /*int*/ sel_initWithContentRect_styleMask_backing_defer_screen_ = Selector.sel_initWithContentRect_styleMask_backing_defer_screen_.value;
-public static final long /*int*/ sel_initWithContentsOfFile_ = Selector.sel_initWithContentsOfFile_.value;
-public static final long /*int*/ sel_initWithData_ = Selector.sel_initWithData_.value;
-public static final long /*int*/ sel_initWithDictionary_ = Selector.sel_initWithDictionary_.value;
-public static final long /*int*/ sel_initWithFileWrapper_ = Selector.sel_initWithFileWrapper_.value;
-public static final long /*int*/ sel_initWithFocusedViewRect_ = Selector.sel_initWithFocusedViewRect_.value;
-public static final long /*int*/ sel_initWithFormat_shareContext_ = Selector.sel_initWithFormat_shareContext_.value;
-public static final long /*int*/ sel_initWithFrame_ = Selector.sel_initWithFrame_.value;
-public static final long /*int*/ sel_initWithFrame_frameName_groupName_ = Selector.sel_initWithFrame_frameName_groupName_.value;
-public static final long /*int*/ sel_initWithFrame_pullsDown_ = Selector.sel_initWithFrame_pullsDown_.value;
-public static final long /*int*/ sel_initWithIconRef_ = Selector.sel_initWithIconRef_.value;
-public static final long /*int*/ sel_initWithIdentifier_ = Selector.sel_initWithIdentifier_.value;
-public static final long /*int*/ sel_initWithImage_hotSpot_ = Selector.sel_initWithImage_hotSpot_.value;
-public static final long /*int*/ sel_initWithIndex_ = Selector.sel_initWithIndex_.value;
-public static final long /*int*/ sel_initWithIndexSet_ = Selector.sel_initWithIndexSet_.value;
-public static final long /*int*/ sel_initWithIndexesInRange_ = Selector.sel_initWithIndexesInRange_.value;
-public static final long /*int*/ sel_initWithItemIdentifier_ = Selector.sel_initWithItemIdentifier_.value;
-public static final long /*int*/ sel_initWithLocaleIdentifier_ = Selector.sel_initWithLocaleIdentifier_.value;
-public static final long /*int*/ sel_initWithName_ = Selector.sel_initWithName_.value;
-public static final long /*int*/ sel_initWithRect_options_owner_userInfo_ = Selector.sel_initWithRect_options_owner_userInfo_.value;
-public static final long /*int*/ sel_initWithSize_ = Selector.sel_initWithSize_.value;
-public static final long /*int*/ sel_initWithStartingColor_endingColor_ = Selector.sel_initWithStartingColor_endingColor_.value;
-public static final long /*int*/ sel_initWithString_ = Selector.sel_initWithString_.value;
-public static final long /*int*/ sel_initWithString_attributes_ = Selector.sel_initWithString_attributes_.value;
-public static final long /*int*/ sel_initWithTitle_ = Selector.sel_initWithTitle_.value;
-public static final long /*int*/ sel_initWithTitle_action_keyEquivalent_ = Selector.sel_initWithTitle_action_keyEquivalent_.value;
-public static final long /*int*/ sel_initWithTransform_ = Selector.sel_initWithTransform_.value;
-public static final long /*int*/ sel_initWithType_location_ = Selector.sel_initWithType_location_.value;
-public static final long /*int*/ sel_initWithURL_ = Selector.sel_initWithURL_.value;
-public static final long /*int*/ sel_insertColor_key_atIndex_ = Selector.sel_insertColor_key_atIndex_.value;
-public static final long /*int*/ sel_insertItem_atIndex_ = Selector.sel_insertItem_atIndex_.value;
-public static final long /*int*/ sel_insertItemWithItemIdentifier_atIndex_ = Selector.sel_insertItemWithItemIdentifier_atIndex_.value;
-public static final long /*int*/ sel_insertItemWithObjectValue_atIndex_ = Selector.sel_insertItemWithObjectValue_atIndex_.value;
-public static final long /*int*/ sel_insertTabViewItem_atIndex_ = Selector.sel_insertTabViewItem_atIndex_.value;
-public static final long /*int*/ sel_insertText_ = Selector.sel_insertText_.value;
-public static final long /*int*/ sel_intValue = Selector.sel_intValue.value;
-public static final long /*int*/ sel_integerValue = Selector.sel_integerValue.value;
-public static final long /*int*/ sel_intercellSpacing = Selector.sel_intercellSpacing.value;
-public static final long /*int*/ sel_interpretKeyEvents_ = Selector.sel_interpretKeyEvents_.value;
-public static final long /*int*/ sel_invalidate = Selector.sel_invalidate.value;
-public static final long /*int*/ sel_invalidateShadow = Selector.sel_invalidateShadow.value;
-public static final long /*int*/ sel_invert = Selector.sel_invert.value;
-public static final long /*int*/ sel_isActive = Selector.sel_isActive.value;
-public static final long /*int*/ sel_isDescendantOf_ = Selector.sel_isDescendantOf_.value;
-public static final long /*int*/ sel_isDocumentEdited = Selector.sel_isDocumentEdited.value;
-public static final long /*int*/ sel_isDrawingToScreen = Selector.sel_isDrawingToScreen.value;
-public static final long /*int*/ sel_isEmpty = Selector.sel_isEmpty.value;
-public static final long /*int*/ sel_isEnabled = Selector.sel_isEnabled.value;
-public static final long /*int*/ sel_isEqual_ = Selector.sel_isEqual_.value;
-public static final long /*int*/ sel_isEqualTo_ = Selector.sel_isEqualTo_.value;
-public static final long /*int*/ sel_isEqualToString_ = Selector.sel_isEqualToString_.value;
-public static final long /*int*/ sel_isExecutableFileAtPath_ = Selector.sel_isExecutableFileAtPath_.value;
-public static final long /*int*/ sel_isFieldEditor = Selector.sel_isFieldEditor.value;
-public static final long /*int*/ sel_isFilePackageAtPath_ = Selector.sel_isFilePackageAtPath_.value;
-public static final long /*int*/ sel_isFileURL = Selector.sel_isFileURL.value;
-public static final long /*int*/ sel_isFlipped = Selector.sel_isFlipped.value;
-public static final long /*int*/ sel_isHidden = Selector.sel_isHidden.value;
-public static final long /*int*/ sel_isHiddenOrHasHiddenAncestor = Selector.sel_isHiddenOrHasHiddenAncestor.value;
-public static final long /*int*/ sel_isHighlighted = Selector.sel_isHighlighted.value;
-public static final long /*int*/ sel_isItemExpanded_ = Selector.sel_isItemExpanded_.value;
-public static final long /*int*/ sel_isKeyWindow = Selector.sel_isKeyWindow.value;
-public static final long /*int*/ sel_isKindOfClass_ = Selector.sel_isKindOfClass_.value;
-public static final long /*int*/ sel_isMainThread = Selector.sel_isMainThread.value;
-public static final long /*int*/ sel_isMainWindow = Selector.sel_isMainWindow.value;
-public static final long /*int*/ sel_isMiniaturized = Selector.sel_isMiniaturized.value;
-public static final long /*int*/ sel_isOpaque = Selector.sel_isOpaque.value;
-public static final long /*int*/ sel_isPlanar = Selector.sel_isPlanar.value;
-public static final long /*int*/ sel_isResting = Selector.sel_isResting.value;
-public static final long /*int*/ sel_isRowSelected_ = Selector.sel_isRowSelected_.value;
-public static final long /*int*/ sel_isRunning = Selector.sel_isRunning.value;
-public static final long /*int*/ sel_isSelectionOnly = Selector.sel_isSelectionOnly.value;
-public static final long /*int*/ sel_isSeparatorItem = Selector.sel_isSeparatorItem.value;
-public static final long /*int*/ sel_isSessionOnly = Selector.sel_isSessionOnly.value;
-public static final long /*int*/ sel_isSheet = Selector.sel_isSheet.value;
-public static final long /*int*/ sel_isVisible = Selector.sel_isVisible.value;
-public static final long /*int*/ sel_isZoomed = Selector.sel_isZoomed.value;
-public static final long /*int*/ sel_itemArray = Selector.sel_itemArray.value;
-public static final long /*int*/ sel_itemAtIndex_ = Selector.sel_itemAtIndex_.value;
-public static final long /*int*/ sel_itemAtRow_ = Selector.sel_itemAtRow_.value;
-public static final long /*int*/ sel_itemHeight = Selector.sel_itemHeight.value;
-public static final long /*int*/ sel_itemIdentifier = Selector.sel_itemIdentifier.value;
-public static final long /*int*/ sel_itemObjectValueAtIndex_ = Selector.sel_itemObjectValueAtIndex_.value;
-public static final long /*int*/ sel_itemTitleAtIndex_ = Selector.sel_itemTitleAtIndex_.value;
-public static final long /*int*/ sel_itemWithTag_ = Selector.sel_itemWithTag_.value;
-public static final long /*int*/ sel_jobDisposition = Selector.sel_jobDisposition.value;
-public static final long /*int*/ sel_keyCode = Selector.sel_keyCode.value;
-public static final long /*int*/ sel_keyDown_ = Selector.sel_keyDown_.value;
-public static final long /*int*/ sel_keyEquivalent = Selector.sel_keyEquivalent.value;
-public static final long /*int*/ sel_keyEquivalentModifierMask = Selector.sel_keyEquivalentModifierMask.value;
-public static final long /*int*/ sel_keyUp_ = Selector.sel_keyUp_.value;
-public static final long /*int*/ sel_keyWindow = Selector.sel_keyWindow.value;
-public static final long /*int*/ sel_knobProportion = Selector.sel_knobProportion.value;
-public static final long /*int*/ sel_knobThickness = Selector.sel_knobThickness.value;
-public static final long /*int*/ sel_lastPathComponent = Selector.sel_lastPathComponent.value;
-public static final long /*int*/ sel_layoutManager = Selector.sel_layoutManager.value;
-public static final long /*int*/ sel_leading = Selector.sel_leading.value;
-public static final long /*int*/ sel_length = Selector.sel_length.value;
-public static final long /*int*/ sel_level = Selector.sel_level.value;
-public static final long /*int*/ sel_levelForItem_ = Selector.sel_levelForItem_.value;
-public static final long /*int*/ sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_ = Selector.sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_.value;
-public static final long /*int*/ sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_ = Selector.sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_.value;
-public static final long /*int*/ sel_lineToPoint_ = Selector.sel_lineToPoint_.value;
-public static final long /*int*/ sel_linkTextAttributes = Selector.sel_linkTextAttributes.value;
-public static final long /*int*/ sel_loadHTMLString_baseURL_ = Selector.sel_loadHTMLString_baseURL_.value;
-public static final long /*int*/ sel_loadNibFile_externalNameTable_withZone_ = Selector.sel_loadNibFile_externalNameTable_withZone_.value;
-public static final long /*int*/ sel_loadRequest_ = Selector.sel_loadRequest_.value;
-public static final long /*int*/ sel_localizedDescription = Selector.sel_localizedDescription.value;
-public static final long /*int*/ sel_location = Selector.sel_location.value;
-public static final long /*int*/ sel_locationForGlyphAtIndex_ = Selector.sel_locationForGlyphAtIndex_.value;
-public static final long /*int*/ sel_locationInWindow = Selector.sel_locationInWindow.value;
-public static final long /*int*/ sel_lockFocus = Selector.sel_lockFocus.value;
-public static final long /*int*/ sel_lowercaseString = Selector.sel_lowercaseString.value;
-public static final long /*int*/ sel_magnification = Selector.sel_magnification.value;
-public static final long /*int*/ sel_magnifyWithEvent_ = Selector.sel_magnifyWithEvent_.value;
-public static final long /*int*/ sel_mainBundle = Selector.sel_mainBundle.value;
-public static final long /*int*/ sel_mainFrame = Selector.sel_mainFrame.value;
-public static final long /*int*/ sel_mainMenu = Selector.sel_mainMenu.value;
-public static final long /*int*/ sel_mainRunLoop = Selector.sel_mainRunLoop.value;
-public static final long /*int*/ sel_mainScreen = Selector.sel_mainScreen.value;
-public static final long /*int*/ sel_mainWindow = Selector.sel_mainWindow.value;
-public static final long /*int*/ sel_makeCurrentContext = Selector.sel_makeCurrentContext.value;
-public static final long /*int*/ sel_makeFirstResponder_ = Selector.sel_makeFirstResponder_.value;
-public static final long /*int*/ sel_makeKeyAndOrderFront_ = Selector.sel_makeKeyAndOrderFront_.value;
-public static final long /*int*/ sel_markedRange = Selector.sel_markedRange.value;
-public static final long /*int*/ sel_markedTextAttributes = Selector.sel_markedTextAttributes.value;
-public static final long /*int*/ sel_maxValue = Selector.sel_maxValue.value;
-public static final long /*int*/ sel_maximum = Selector.sel_maximum.value;
-public static final long /*int*/ sel_maximumFractionDigits = Selector.sel_maximumFractionDigits.value;
-public static final long /*int*/ sel_maximumIntegerDigits = Selector.sel_maximumIntegerDigits.value;
-public static final long /*int*/ sel_menu = Selector.sel_menu.value;
-public static final long /*int*/ sel_menu_willHighlightItem_ = Selector.sel_menu_willHighlightItem_.value;
-public static final long /*int*/ sel_menuBarFontOfSize_ = Selector.sel_menuBarFontOfSize_.value;
-public static final long /*int*/ sel_menuDidClose_ = Selector.sel_menuDidClose_.value;
-public static final long /*int*/ sel_menuFontOfSize_ = Selector.sel_menuFontOfSize_.value;
-public static final long /*int*/ sel_menuForEvent_ = Selector.sel_menuForEvent_.value;
-public static final long /*int*/ sel_menuNeedsUpdate_ = Selector.sel_menuNeedsUpdate_.value;
-public static final long /*int*/ sel_menuWillOpen_ = Selector.sel_menuWillOpen_.value;
-public static final long /*int*/ sel_metaKey = Selector.sel_metaKey.value;
-public static final long /*int*/ sel_minFrameWidthWithTitle_styleMask_ = Selector.sel_minFrameWidthWithTitle_styleMask_.value;
-public static final long /*int*/ sel_minSize = Selector.sel_minSize.value;
-public static final long /*int*/ sel_minValue = Selector.sel_minValue.value;
-public static final long /*int*/ sel_miniaturize_ = Selector.sel_miniaturize_.value;
-public static final long /*int*/ sel_minimum = Selector.sel_minimum.value;
-public static final long /*int*/ sel_minimumSize = Selector.sel_minimumSize.value;
-public static final long /*int*/ sel_minuteOfHour = Selector.sel_minuteOfHour.value;
-public static final long /*int*/ sel_modifierFlags = Selector.sel_modifierFlags.value;
-public static final long /*int*/ sel_monthOfYear = Selector.sel_monthOfYear.value;
-public static final long /*int*/ sel_mouse_inRect_ = Selector.sel_mouse_inRect_.value;
-public static final long /*int*/ sel_mouseDown_ = Selector.sel_mouseDown_.value;
-public static final long /*int*/ sel_mouseDownCanMoveWindow = Selector.sel_mouseDownCanMoveWindow.value;
-public static final long /*int*/ sel_mouseDragged_ = Selector.sel_mouseDragged_.value;
-public static final long /*int*/ sel_mouseEntered_ = Selector.sel_mouseEntered_.value;
-public static final long /*int*/ sel_mouseExited_ = Selector.sel_mouseExited_.value;
-public static final long /*int*/ sel_mouseLocation = Selector.sel_mouseLocation.value;
-public static final long /*int*/ sel_mouseLocationOutsideOfEventStream = Selector.sel_mouseLocationOutsideOfEventStream.value;
-public static final long /*int*/ sel_mouseMoved_ = Selector.sel_mouseMoved_.value;
-public static final long /*int*/ sel_mouseUp_ = Selector.sel_mouseUp_.value;
-public static final long /*int*/ sel_moveColumn_toColumn_ = Selector.sel_moveColumn_toColumn_.value;
-public static final long /*int*/ sel_moveToBeginningOfParagraph_ = Selector.sel_moveToBeginningOfParagraph_.value;
-public static final long /*int*/ sel_moveToEndOfParagraph_ = Selector.sel_moveToEndOfParagraph_.value;
-public static final long /*int*/ sel_moveToPoint_ = Selector.sel_moveToPoint_.value;
-public static final long /*int*/ sel_moveUp_ = Selector.sel_moveUp_.value;
-public static final long /*int*/ sel_mutableCopy = Selector.sel_mutableCopy.value;
-public static final long /*int*/ sel_mutableString = Selector.sel_mutableString.value;
-public static final long /*int*/ sel_name = Selector.sel_name.value;
-public static final long /*int*/ sel_needsPanelToBecomeKey = Selector.sel_needsPanelToBecomeKey.value;
-public static final long /*int*/ sel_nextEventMatchingMask_untilDate_inMode_dequeue_ = Selector.sel_nextEventMatchingMask_untilDate_inMode_dequeue_.value;
-public static final long /*int*/ sel_nextObject = Selector.sel_nextObject.value;
-public static final long /*int*/ sel_nextState = Selector.sel_nextState.value;
-public static final long /*int*/ sel_nextWordFromIndex_forward_ = Selector.sel_nextWordFromIndex_forward_.value;
-public static final long /*int*/ sel_noResponderFor_ = Selector.sel_noResponderFor_.value;
-public static final long /*int*/ sel_normalizedPosition = Selector.sel_normalizedPosition.value;
-public static final long /*int*/ sel_noteNumberOfRowsChanged = Selector.sel_noteNumberOfRowsChanged.value;
-public static final long /*int*/ sel_numberOfColumns = Selector.sel_numberOfColumns.value;
-public static final long /*int*/ sel_numberOfComponents = Selector.sel_numberOfComponents.value;
-public static final long /*int*/ sel_numberOfGlyphs = Selector.sel_numberOfGlyphs.value;
-public static final long /*int*/ sel_numberOfItems = Selector.sel_numberOfItems.value;
-public static final long /*int*/ sel_numberOfPlanes = Selector.sel_numberOfPlanes.value;
-public static final long /*int*/ sel_numberOfRows = Selector.sel_numberOfRows.value;
-public static final long /*int*/ sel_numberOfRowsInTableView_ = Selector.sel_numberOfRowsInTableView_.value;
-public static final long /*int*/ sel_numberOfSelectedRows = Selector.sel_numberOfSelectedRows.value;
-public static final long /*int*/ sel_numberOfVisibleItems = Selector.sel_numberOfVisibleItems.value;
-public static final long /*int*/ sel_numberWithBool_ = Selector.sel_numberWithBool_.value;
-public static final long /*int*/ sel_numberWithDouble_ = Selector.sel_numberWithDouble_.value;
-public static final long /*int*/ sel_numberWithInt_ = Selector.sel_numberWithInt_.value;
-public static final long /*int*/ sel_numberWithInteger_ = Selector.sel_numberWithInteger_.value;
-public static final long /*int*/ sel_objCType = Selector.sel_objCType.value;
-public static final long /*int*/ sel_object = Selector.sel_object.value;
-public static final long /*int*/ sel_objectAtIndex_ = Selector.sel_objectAtIndex_.value;
-public static final long /*int*/ sel_objectEnumerator = Selector.sel_objectEnumerator.value;
-public static final long /*int*/ sel_objectForInfoDictionaryKey_ = Selector.sel_objectForInfoDictionaryKey_.value;
-public static final long /*int*/ sel_objectForKey_ = Selector.sel_objectForKey_.value;
-public static final long /*int*/ sel_objectValues = Selector.sel_objectValues.value;
-public static final long /*int*/ sel_openFile_withApplication_ = Selector.sel_openFile_withApplication_.value;
-public static final long /*int*/ sel_openPanel = Selector.sel_openPanel.value;
-public static final long /*int*/ sel_openURL_ = Selector.sel_openURL_.value;
-public static final long /*int*/ sel_openURLs_withAppBundleIdentifier_options_additionalEventParamDescriptor_launchIdentifiers_ = Selector.sel_openURLs_withAppBundleIdentifier_options_additionalEventParamDescriptor_launchIdentifiers_.value;
-public static final long /*int*/ sel_operationNotAllowedCursor = Selector.sel_operationNotAllowedCursor.value;
-public static final long /*int*/ sel_options = Selector.sel_options.value;
-public static final long /*int*/ sel_orderBack_ = Selector.sel_orderBack_.value;
-public static final long /*int*/ sel_orderFront_ = Selector.sel_orderFront_.value;
-public static final long /*int*/ sel_orderFrontRegardless = Selector.sel_orderFrontRegardless.value;
-public static final long /*int*/ sel_orderFrontStandardAboutPanel_ = Selector.sel_orderFrontStandardAboutPanel_.value;
-public static final long /*int*/ sel_orderOut_ = Selector.sel_orderOut_.value;
-public static final long /*int*/ sel_orderWindow_relativeTo_ = Selector.sel_orderWindow_relativeTo_.value;
-public static final long /*int*/ sel_orderedWindows = Selector.sel_orderedWindows.value;
-public static final long /*int*/ sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_ = Selector.sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_.value;
-public static final long /*int*/ sel_otherMouseDown_ = Selector.sel_otherMouseDown_.value;
-public static final long /*int*/ sel_otherMouseDragged_ = Selector.sel_otherMouseDragged_.value;
-public static final long /*int*/ sel_otherMouseUp_ = Selector.sel_otherMouseUp_.value;
-public static final long /*int*/ sel_outlineTableColumn = Selector.sel_outlineTableColumn.value;
-public static final long /*int*/ sel_outlineView_acceptDrop_item_childIndex_ = Selector.sel_outlineView_acceptDrop_item_childIndex_.value;
-public static final long /*int*/ sel_outlineView_child_ofItem_ = Selector.sel_outlineView_child_ofItem_.value;
-public static final long /*int*/ sel_outlineView_didClickTableColumn_ = Selector.sel_outlineView_didClickTableColumn_.value;
-public static final long /*int*/ sel_outlineView_isItemExpandable_ = Selector.sel_outlineView_isItemExpandable_.value;
-public static final long /*int*/ sel_outlineView_numberOfChildrenOfItem_ = Selector.sel_outlineView_numberOfChildrenOfItem_.value;
-public static final long /*int*/ sel_outlineView_objectValueForTableColumn_byItem_ = Selector.sel_outlineView_objectValueForTableColumn_byItem_.value;
-public static final long /*int*/ sel_outlineView_setObjectValue_forTableColumn_byItem_ = Selector.sel_outlineView_setObjectValue_forTableColumn_byItem_.value;
-public static final long /*int*/ sel_outlineView_shouldCollapseItem_ = Selector.sel_outlineView_shouldCollapseItem_.value;
-public static final long /*int*/ sel_outlineView_shouldEditTableColumn_item_ = Selector.sel_outlineView_shouldEditTableColumn_item_.value;
-public static final long /*int*/ sel_outlineView_shouldExpandItem_ = Selector.sel_outlineView_shouldExpandItem_.value;
-public static final long /*int*/ sel_outlineView_shouldReorderColumn_toColumn_ = Selector.sel_outlineView_shouldReorderColumn_toColumn_.value;
-public static final long /*int*/ sel_outlineView_shouldSelectItem_ = Selector.sel_outlineView_shouldSelectItem_.value;
-public static final long /*int*/ sel_outlineView_shouldTrackCell_forTableColumn_item_ = Selector.sel_outlineView_shouldTrackCell_forTableColumn_item_.value;
-public static final long /*int*/ sel_outlineView_validateDrop_proposedItem_proposedChildIndex_ = Selector.sel_outlineView_validateDrop_proposedItem_proposedChildIndex_.value;
-public static final long /*int*/ sel_outlineView_willDisplayCell_forTableColumn_item_ = Selector.sel_outlineView_willDisplayCell_forTableColumn_item_.value;
-public static final long /*int*/ sel_outlineView_writeItems_toPasteboard_ = Selector.sel_outlineView_writeItems_toPasteboard_.value;
-public static final long /*int*/ sel_outlineViewColumnDidMove_ = Selector.sel_outlineViewColumnDidMove_.value;
-public static final long /*int*/ sel_outlineViewColumnDidResize_ = Selector.sel_outlineViewColumnDidResize_.value;
-public static final long /*int*/ sel_outlineViewItemDidExpand_ = Selector.sel_outlineViewItemDidExpand_.value;
-public static final long /*int*/ sel_outlineViewSelectionDidChange_ = Selector.sel_outlineViewSelectionDidChange_.value;
-public static final long /*int*/ sel_outlineViewSelectionIsChanging_ = Selector.sel_outlineViewSelectionIsChanging_.value;
-public static final long /*int*/ sel_owner = Selector.sel_owner.value;
-public static final long /*int*/ sel_pageDown_ = Selector.sel_pageDown_.value;
-public static final long /*int*/ sel_pageTitle = Selector.sel_pageTitle.value;
-public static final long /*int*/ sel_pageUp_ = Selector.sel_pageUp_.value;
-public static final long /*int*/ sel_panel_shouldShowFilename_ = Selector.sel_panel_shouldShowFilename_.value;
-public static final long /*int*/ sel_panelConvertFont_ = Selector.sel_panelConvertFont_.value;
-public static final long /*int*/ sel_paperSize = Selector.sel_paperSize.value;
-public static final long /*int*/ sel_paragraphs = Selector.sel_paragraphs.value;
-public static final long /*int*/ sel_parentWindow = Selector.sel_parentWindow.value;
-public static final long /*int*/ sel_password = Selector.sel_password.value;
-public static final long /*int*/ sel_paste_ = Selector.sel_paste_.value;
-public static final long /*int*/ sel_pasteboard_provideDataForType_ = Selector.sel_pasteboard_provideDataForType_.value;
-public static final long /*int*/ sel_pasteboardWithName_ = Selector.sel_pasteboardWithName_.value;
-public static final long /*int*/ sel_path = Selector.sel_path.value;
-public static final long /*int*/ sel_pathExtension = Selector.sel_pathExtension.value;
-public static final long /*int*/ sel_pathForResource_ofType_ = Selector.sel_pathForResource_ofType_.value;
-public static final long /*int*/ sel_pathForResource_ofType_inDirectory_forLocalization_ = Selector.sel_pathForResource_ofType_inDirectory_forLocalization_.value;
-public static final long /*int*/ sel_performDragOperation_ = Selector.sel_performDragOperation_.value;
-public static final long /*int*/ sel_performKeyEquivalent_ = Selector.sel_performKeyEquivalent_.value;
-public static final long /*int*/ sel_performSelector_withObject_afterDelay_inModes_ = Selector.sel_performSelector_withObject_afterDelay_inModes_.value;
-public static final long /*int*/ sel_performSelectorOnMainThread_withObject_waitUntilDone_ = Selector.sel_performSelectorOnMainThread_withObject_waitUntilDone_.value;
-public static final long /*int*/ sel_phase = Selector.sel_phase.value;
-public static final long /*int*/ sel_pixelsHigh = Selector.sel_pixelsHigh.value;
-public static final long /*int*/ sel_pixelsWide = Selector.sel_pixelsWide.value;
-public static final long /*int*/ sel_pointSize = Selector.sel_pointSize.value;
-public static final long /*int*/ sel_pointValue = Selector.sel_pointValue.value;
-public static final long /*int*/ sel_pointingHandCursor = Selector.sel_pointingHandCursor.value;
-public static final long /*int*/ sel_pop = Selector.sel_pop.value;
-public static final long /*int*/ sel_popUpContextMenu_withEvent_forView_ = Selector.sel_popUpContextMenu_withEvent_forView_.value;
-public static final long /*int*/ sel_popUpStatusItemMenu_ = Selector.sel_popUpStatusItemMenu_.value;
-public static final long /*int*/ sel_port = Selector.sel_port.value;
-public static final long /*int*/ sel_postEvent_atStart_ = Selector.sel_postEvent_atStart_.value;
-public static final long /*int*/ sel_preparedCellAtColumn_row_ = Selector.sel_preparedCellAtColumn_row_.value;
-public static final long /*int*/ sel_prependTransform_ = Selector.sel_prependTransform_.value;
-public static final long /*int*/ sel_preventDefault = Selector.sel_preventDefault.value;
-public static final long /*int*/ sel_previousFailureCount = Selector.sel_previousFailureCount.value;
-public static final long /*int*/ sel_printDocumentView = Selector.sel_printDocumentView.value;
-public static final long /*int*/ sel_printOperationWithPrintInfo_ = Selector.sel_printOperationWithPrintInfo_.value;
-public static final long /*int*/ sel_printOperationWithView_printInfo_ = Selector.sel_printOperationWithView_printInfo_.value;
-public static final long /*int*/ sel_printPanel = Selector.sel_printPanel.value;
-public static final long /*int*/ sel_printSettings = Selector.sel_printSettings.value;
-public static final long /*int*/ sel_printer = Selector.sel_printer.value;
-public static final long /*int*/ sel_printerNames = Selector.sel_printerNames.value;
-public static final long /*int*/ sel_printerWithName_ = Selector.sel_printerWithName_.value;
-public static final long /*int*/ sel_propertyListForType_ = Selector.sel_propertyListForType_.value;
-public static final long /*int*/ sel_proposedCredential = Selector.sel_proposedCredential.value;
-public static final long /*int*/ sel_protectionSpace = Selector.sel_protectionSpace.value;
-public static final long /*int*/ sel_push = Selector.sel_push.value;
-public static final long /*int*/ sel_rangeValue = Selector.sel_rangeValue.value;
-public static final long /*int*/ sel_readSelectionFromPasteboard_ = Selector.sel_readSelectionFromPasteboard_.value;
-public static final long /*int*/ sel_realm = Selector.sel_realm.value;
-public static final long /*int*/ sel_recentSearches = Selector.sel_recentSearches.value;
-public static final long /*int*/ sel_rectArrayForCharacterRange_withinSelectedCharacterRange_inTextContainer_rectCount_ = Selector.sel_rectArrayForCharacterRange_withinSelectedCharacterRange_inTextContainer_rectCount_.value;
-public static final long /*int*/ sel_rectArrayForGlyphRange_withinSelectedGlyphRange_inTextContainer_rectCount_ = Selector.sel_rectArrayForGlyphRange_withinSelectedGlyphRange_inTextContainer_rectCount_.value;
-public static final long /*int*/ sel_rectForPart_ = Selector.sel_rectForPart_.value;
-public static final long /*int*/ sel_rectOfColumn_ = Selector.sel_rectOfColumn_.value;
-public static final long /*int*/ sel_rectOfRow_ = Selector.sel_rectOfRow_.value;
-public static final long /*int*/ sel_rectValue = Selector.sel_rectValue.value;
-public static final long /*int*/ sel_redComponent = Selector.sel_redComponent.value;
-public static final long /*int*/ sel_redo = Selector.sel_redo.value;
-public static final long /*int*/ sel_reflectScrolledClipView_ = Selector.sel_reflectScrolledClipView_.value;
-public static final long /*int*/ sel_registerForDraggedTypes_ = Selector.sel_registerForDraggedTypes_.value;
-public static final long /*int*/ sel_release = Selector.sel_release.value;
-public static final long /*int*/ sel_reload_ = Selector.sel_reload_.value;
-public static final long /*int*/ sel_reloadData = Selector.sel_reloadData.value;
-public static final long /*int*/ sel_reloadItem_reloadChildren_ = Selector.sel_reloadItem_reloadChildren_.value;
-public static final long /*int*/ sel_removeAllItems = Selector.sel_removeAllItems.value;
-public static final long /*int*/ sel_removeAllPoints = Selector.sel_removeAllPoints.value;
-public static final long /*int*/ sel_removeAttribute_range_ = Selector.sel_removeAttribute_range_.value;
-public static final long /*int*/ sel_removeChildWindow_ = Selector.sel_removeChildWindow_.value;
-public static final long /*int*/ sel_removeColorWithKey_ = Selector.sel_removeColorWithKey_.value;
-public static final long /*int*/ sel_removeFromSuperview = Selector.sel_removeFromSuperview.value;
-public static final long /*int*/ sel_removeIndex_ = Selector.sel_removeIndex_.value;
-public static final long /*int*/ sel_removeItem_ = Selector.sel_removeItem_.value;
-public static final long /*int*/ sel_removeItemAtIndex_ = Selector.sel_removeItemAtIndex_.value;
-public static final long /*int*/ sel_removeItemAtPath_error_ = Selector.sel_removeItemAtPath_error_.value;
-public static final long /*int*/ sel_removeLastObject = Selector.sel_removeLastObject.value;
-public static final long /*int*/ sel_removeObject_ = Selector.sel_removeObject_.value;
-public static final long /*int*/ sel_removeObjectAtIndex_ = Selector.sel_removeObjectAtIndex_.value;
-public static final long /*int*/ sel_removeObjectForKey_ = Selector.sel_removeObjectForKey_.value;
-public static final long /*int*/ sel_removeObjectIdenticalTo_ = Selector.sel_removeObjectIdenticalTo_.value;
-public static final long /*int*/ sel_removeObserver_ = Selector.sel_removeObserver_.value;
-public static final long /*int*/ sel_removeObserver_name_object_ = Selector.sel_removeObserver_name_object_.value;
-public static final long /*int*/ sel_removeRepresentation_ = Selector.sel_removeRepresentation_.value;
-public static final long /*int*/ sel_removeStatusItem_ = Selector.sel_removeStatusItem_.value;
-public static final long /*int*/ sel_removeTabViewItem_ = Selector.sel_removeTabViewItem_.value;
-public static final long /*int*/ sel_removeTableColumn_ = Selector.sel_removeTableColumn_.value;
-public static final long /*int*/ sel_removeTemporaryAttribute_forCharacterRange_ = Selector.sel_removeTemporaryAttribute_forCharacterRange_.value;
-public static final long /*int*/ sel_removeToolTip_ = Selector.sel_removeToolTip_.value;
-public static final long /*int*/ sel_removeTrackingArea_ = Selector.sel_removeTrackingArea_.value;
-public static final long /*int*/ sel_replaceCharactersInRange_withString_ = Selector.sel_replaceCharactersInRange_withString_.value;
-public static final long /*int*/ sel_replyToOpenOrPrint_ = Selector.sel_replyToOpenOrPrint_.value;
-public static final long /*int*/ sel_representation = Selector.sel_representation.value;
-public static final long /*int*/ sel_representations = Selector.sel_representations.value;
-public static final long /*int*/ sel_request = Selector.sel_request.value;
-public static final long /*int*/ sel_requestWithURL_ = Selector.sel_requestWithURL_.value;
-public static final long /*int*/ sel_resetCursorRects = Selector.sel_resetCursorRects.value;
-public static final long /*int*/ sel_resignFirstResponder = Selector.sel_resignFirstResponder.value;
-public static final long /*int*/ sel_resizeDownCursor = Selector.sel_resizeDownCursor.value;
-public static final long /*int*/ sel_resizeLeftCursor = Selector.sel_resizeLeftCursor.value;
-public static final long /*int*/ sel_resizeLeftRightCursor = Selector.sel_resizeLeftRightCursor.value;
-public static final long /*int*/ sel_resizeRightCursor = Selector.sel_resizeRightCursor.value;
-public static final long /*int*/ sel_resizeUpCursor = Selector.sel_resizeUpCursor.value;
-public static final long /*int*/ sel_resizeUpDownCursor = Selector.sel_resizeUpDownCursor.value;
-public static final long /*int*/ sel_resizingMask = Selector.sel_resizingMask.value;
-public static final long /*int*/ sel_resourcePath = Selector.sel_resourcePath.value;
-public static final long /*int*/ sel_respondsToSelector_ = Selector.sel_respondsToSelector_.value;
-public static final long /*int*/ sel_restoreGraphicsState = Selector.sel_restoreGraphicsState.value;
-public static final long /*int*/ sel_retain = Selector.sel_retain.value;
-public static final long /*int*/ sel_retainCount = Selector.sel_retainCount.value;
-public static final long /*int*/ sel_rightMouseDown_ = Selector.sel_rightMouseDown_.value;
-public static final long /*int*/ sel_rightMouseDragged_ = Selector.sel_rightMouseDragged_.value;
-public static final long /*int*/ sel_rightMouseUp_ = Selector.sel_rightMouseUp_.value;
-public static final long /*int*/ sel_rotateByDegrees_ = Selector.sel_rotateByDegrees_.value;
-public static final long /*int*/ sel_rotateWithEvent_ = Selector.sel_rotateWithEvent_.value;
-public static final long /*int*/ sel_rotation = Selector.sel_rotation.value;
-public static final long /*int*/ sel_rowAtPoint_ = Selector.sel_rowAtPoint_.value;
-public static final long /*int*/ sel_rowForItem_ = Selector.sel_rowForItem_.value;
-public static final long /*int*/ sel_rowHeight = Selector.sel_rowHeight.value;
-public static final long /*int*/ sel_rowsInRect_ = Selector.sel_rowsInRect_.value;
-public static final long /*int*/ sel_run = Selector.sel_run.value;
-public static final long /*int*/ sel_runModal = Selector.sel_runModal.value;
-public static final long /*int*/ sel_runModalForDirectory_file_ = Selector.sel_runModalForDirectory_file_.value;
-public static final long /*int*/ sel_runModalForWindow_ = Selector.sel_runModalForWindow_.value;
-public static final long /*int*/ sel_runModalWithPrintInfo_ = Selector.sel_runModalWithPrintInfo_.value;
-public static final long /*int*/ sel_runMode_beforeDate_ = Selector.sel_runMode_beforeDate_.value;
-public static final long /*int*/ sel_runOperation = Selector.sel_runOperation.value;
-public static final long /*int*/ sel_samplesPerPixel = Selector.sel_samplesPerPixel.value;
-public static final long /*int*/ sel_saveGraphicsState = Selector.sel_saveGraphicsState.value;
-public static final long /*int*/ sel_savePanel = Selector.sel_savePanel.value;
-public static final long /*int*/ sel_scaleXBy_yBy_ = Selector.sel_scaleXBy_yBy_.value;
-public static final long /*int*/ sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_ = Selector.sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_.value;
-public static final long /*int*/ sel_screen = Selector.sel_screen.value;
-public static final long /*int*/ sel_screenX = Selector.sel_screenX.value;
-public static final long /*int*/ sel_screenY = Selector.sel_screenY.value;
-public static final long /*int*/ sel_screens = Selector.sel_screens.value;
-public static final long /*int*/ sel_scrollClipView_toPoint_ = Selector.sel_scrollClipView_toPoint_.value;
-public static final long /*int*/ sel_scrollColumnToVisible_ = Selector.sel_scrollColumnToVisible_.value;
-public static final long /*int*/ sel_scrollPoint_ = Selector.sel_scrollPoint_.value;
-public static final long /*int*/ sel_scrollRangeToVisible_ = Selector.sel_scrollRangeToVisible_.value;
-public static final long /*int*/ sel_scrollRect_by_ = Selector.sel_scrollRect_by_.value;
-public static final long /*int*/ sel_scrollRectToVisible_ = Selector.sel_scrollRectToVisible_.value;
-public static final long /*int*/ sel_scrollRowToVisible_ = Selector.sel_scrollRowToVisible_.value;
-public static final long /*int*/ sel_scrollToPoint_ = Selector.sel_scrollToPoint_.value;
-public static final long /*int*/ sel_scrollWheel_ = Selector.sel_scrollWheel_.value;
-public static final long /*int*/ sel_scrollerWidth = Selector.sel_scrollerWidth.value;
-public static final long /*int*/ sel_scrollerWidthForControlSize_ = Selector.sel_scrollerWidthForControlSize_.value;
-public static final long /*int*/ sel_searchButtonCell = Selector.sel_searchButtonCell.value;
-public static final long /*int*/ sel_searchButtonRectForBounds_ = Selector.sel_searchButtonRectForBounds_.value;
-public static final long /*int*/ sel_searchTextRectForBounds_ = Selector.sel_searchTextRectForBounds_.value;
-public static final long /*int*/ sel_secondOfMinute = Selector.sel_secondOfMinute.value;
-public static final long /*int*/ sel_secondarySelectedControlColor = Selector.sel_secondarySelectedControlColor.value;
-public static final long /*int*/ sel_selectAll_ = Selector.sel_selectAll_.value;
-public static final long /*int*/ sel_selectItem_ = Selector.sel_selectItem_.value;
-public static final long /*int*/ sel_selectItemAtIndex_ = Selector.sel_selectItemAtIndex_.value;
-public static final long /*int*/ sel_selectRowIndexes_byExtendingSelection_ = Selector.sel_selectRowIndexes_byExtendingSelection_.value;
-public static final long /*int*/ sel_selectTabViewItemAtIndex_ = Selector.sel_selectTabViewItemAtIndex_.value;
-public static final long /*int*/ sel_selectText_ = Selector.sel_selectText_.value;
-public static final long /*int*/ sel_selectedControlColor = Selector.sel_selectedControlColor.value;
-public static final long /*int*/ sel_selectedControlTextColor = Selector.sel_selectedControlTextColor.value;
-public static final long /*int*/ sel_selectedRange = Selector.sel_selectedRange.value;
-public static final long /*int*/ sel_selectedRow = Selector.sel_selectedRow.value;
-public static final long /*int*/ sel_selectedRowIndexes = Selector.sel_selectedRowIndexes.value;
-public static final long /*int*/ sel_selectedTabViewItem = Selector.sel_selectedTabViewItem.value;
-public static final long /*int*/ sel_selectedTextAttributes = Selector.sel_selectedTextAttributes.value;
-public static final long /*int*/ sel_selectedTextBackgroundColor = Selector.sel_selectedTextBackgroundColor.value;
-public static final long /*int*/ sel_selectedTextColor = Selector.sel_selectedTextColor.value;
-public static final long /*int*/ sel_sendAction_to_ = Selector.sel_sendAction_to_.value;
-public static final long /*int*/ sel_sendAction_to_from_ = Selector.sel_sendAction_to_from_.value;
-public static final long /*int*/ sel_sendEvent_ = Selector.sel_sendEvent_.value;
-public static final long /*int*/ sel_sender = Selector.sel_sender.value;
-public static final long /*int*/ sel_separatorItem = Selector.sel_separatorItem.value;
-public static final long /*int*/ sel_set = Selector.sel_set.value;
-public static final long /*int*/ sel_setAcceptsMouseMovedEvents_ = Selector.sel_setAcceptsMouseMovedEvents_.value;
-public static final long /*int*/ sel_setAcceptsTouchEvents_ = Selector.sel_setAcceptsTouchEvents_.value;
-public static final long /*int*/ sel_setAccessoryView_ = Selector.sel_setAccessoryView_.value;
-public static final long /*int*/ sel_setAction_ = Selector.sel_setAction_.value;
-public static final long /*int*/ sel_setActivationPolicy_ = Selector.sel_setActivationPolicy_.value;
-public static final long /*int*/ sel_setAlertStyle_ = Selector.sel_setAlertStyle_.value;
-public static final long /*int*/ sel_setAlignment_ = Selector.sel_setAlignment_.value;
-public static final long /*int*/ sel_setAllowedFileTypes_ = Selector.sel_setAllowedFileTypes_.value;
-public static final long /*int*/ sel_setAllowsColumnReordering_ = Selector.sel_setAllowsColumnReordering_.value;
-public static final long /*int*/ sel_setAllowsFloats_ = Selector.sel_setAllowsFloats_.value;
-public static final long /*int*/ sel_setAllowsMixedState_ = Selector.sel_setAllowsMixedState_.value;
-public static final long /*int*/ sel_setAllowsMultipleSelection_ = Selector.sel_setAllowsMultipleSelection_.value;
-public static final long /*int*/ sel_setAllowsOtherFileTypes_ = Selector.sel_setAllowsOtherFileTypes_.value;
-public static final long /*int*/ sel_setAllowsUndo_ = Selector.sel_setAllowsUndo_.value;
-public static final long /*int*/ sel_setAllowsUserCustomization_ = Selector.sel_setAllowsUserCustomization_.value;
-public static final long /*int*/ sel_setAlpha_ = Selector.sel_setAlpha_.value;
-public static final long /*int*/ sel_setAlphaValue_ = Selector.sel_setAlphaValue_.value;
-public static final long /*int*/ sel_setAlternateButtonTitle_ = Selector.sel_setAlternateButtonTitle_.value;
-public static final long /*int*/ sel_setAppearance_ = Selector.sel_setAppearance_.value;
-public static final long /*int*/ sel_setApplicationIconImage_ = Selector.sel_setApplicationIconImage_.value;
-public static final long /*int*/ sel_setApplicationNameForUserAgent_ = Selector.sel_setApplicationNameForUserAgent_.value;
-public static final long /*int*/ sel_setAttachmentCell_ = Selector.sel_setAttachmentCell_.value;
-public static final long /*int*/ sel_setAttributedString_ = Selector.sel_setAttributedString_.value;
-public static final long /*int*/ sel_setAttributedStringValue_ = Selector.sel_setAttributedStringValue_.value;
-public static final long /*int*/ sel_setAttributedTitle_ = Selector.sel_setAttributedTitle_.value;
-public static final long /*int*/ sel_setAutoenablesItems_ = Selector.sel_setAutoenablesItems_.value;
-public static final long /*int*/ sel_setAutohidesScrollers_ = Selector.sel_setAutohidesScrollers_.value;
-public static final long /*int*/ sel_setAutoresizesOutlineColumn_ = Selector.sel_setAutoresizesOutlineColumn_.value;
-public static final long /*int*/ sel_setAutoresizesSubviews_ = Selector.sel_setAutoresizesSubviews_.value;
-public static final long /*int*/ sel_setAutoresizingMask_ = Selector.sel_setAutoresizingMask_.value;
-public static final long /*int*/ sel_setAutosaveExpandedItems_ = Selector.sel_setAutosaveExpandedItems_.value;
-public static final long /*int*/ sel_setBackgroundColor_ = Selector.sel_setBackgroundColor_.value;
-public static final long /*int*/ sel_setBackgroundLayoutEnabled_ = Selector.sel_setBackgroundLayoutEnabled_.value;
-public static final long /*int*/ sel_setBackgroundStyle_ = Selector.sel_setBackgroundStyle_.value;
-public static final long /*int*/ sel_setBadgeLabel_ = Selector.sel_setBadgeLabel_.value;
-public static final long /*int*/ sel_setBaseWritingDirection_ = Selector.sel_setBaseWritingDirection_.value;
-public static final long /*int*/ sel_setBaseWritingDirection_range_ = Selector.sel_setBaseWritingDirection_range_.value;
-public static final long /*int*/ sel_setBecomesKeyOnlyIfNeeded_ = Selector.sel_setBecomesKeyOnlyIfNeeded_.value;
-public static final long /*int*/ sel_setBezelStyle_ = Selector.sel_setBezelStyle_.value;
-public static final long /*int*/ sel_setBezeled_ = Selector.sel_setBezeled_.value;
-public static final long /*int*/ sel_setBorderType_ = Selector.sel_setBorderType_.value;
-public static final long /*int*/ sel_setBorderWidth_ = Selector.sel_setBorderWidth_.value;
-public static final long /*int*/ sel_setBordered_ = Selector.sel_setBordered_.value;
-public static final long /*int*/ sel_setBoundsRotation_ = Selector.sel_setBoundsRotation_.value;
-public static final long /*int*/ sel_setBoxType_ = Selector.sel_setBoxType_.value;
-public static final long /*int*/ sel_setButtonType_ = Selector.sel_setButtonType_.value;
-public static final long /*int*/ sel_setCacheMode_ = Selector.sel_setCacheMode_.value;
-public static final long /*int*/ sel_setCachePolicy_ = Selector.sel_setCachePolicy_.value;
-public static final long /*int*/ sel_setCanChooseDirectories_ = Selector.sel_setCanChooseDirectories_.value;
-public static final long /*int*/ sel_setCanChooseFiles_ = Selector.sel_setCanChooseFiles_.value;
-public static final long /*int*/ sel_setCanCreateDirectories_ = Selector.sel_setCanCreateDirectories_.value;
-public static final long /*int*/ sel_setCancelButtonCell_ = Selector.sel_setCancelButtonCell_.value;
-public static final long /*int*/ sel_setCell_ = Selector.sel_setCell_.value;
-public static final long /*int*/ sel_setCellClass_ = Selector.sel_setCellClass_.value;
-public static final long /*int*/ sel_setClip = Selector.sel_setClip.value;
-public static final long /*int*/ sel_setCollectionBehavior_ = Selector.sel_setCollectionBehavior_.value;
-public static final long /*int*/ sel_setColor_ = Selector.sel_setColor_.value;
-public static final long /*int*/ sel_setColumnAutoresizingStyle_ = Selector.sel_setColumnAutoresizingStyle_.value;
-public static final long /*int*/ sel_setCompositingOperation_ = Selector.sel_setCompositingOperation_.value;
-public static final long /*int*/ sel_setContainerSize_ = Selector.sel_setContainerSize_.value;
-public static final long /*int*/ sel_setContentView_ = Selector.sel_setContentView_.value;
-public static final long /*int*/ sel_setContentViewMargins_ = Selector.sel_setContentViewMargins_.value;
-public static final long /*int*/ sel_setControlSize_ = Selector.sel_setControlSize_.value;
-public static final long /*int*/ sel_setCookie_ = Selector.sel_setCookie_.value;
-public static final long /*int*/ sel_setCopiesOnScroll_ = Selector.sel_setCopiesOnScroll_.value;
-public static final long /*int*/ sel_setCurrentContext_ = Selector.sel_setCurrentContext_.value;
-public static final long /*int*/ sel_setCurrentOperation_ = Selector.sel_setCurrentOperation_.value;
-public static final long /*int*/ sel_setCustomUserAgent_ = Selector.sel_setCustomUserAgent_.value;
-public static final long /*int*/ sel_setData_forType_ = Selector.sel_setData_forType_.value;
-public static final long /*int*/ sel_setDataCell_ = Selector.sel_setDataCell_.value;
-public static final long /*int*/ sel_setDataSource_ = Selector.sel_setDataSource_.value;
-public static final long /*int*/ sel_setDatePickerElements_ = Selector.sel_setDatePickerElements_.value;
-public static final long /*int*/ sel_setDatePickerStyle_ = Selector.sel_setDatePickerStyle_.value;
-public static final long /*int*/ sel_setDateValue_ = Selector.sel_setDateValue_.value;
-public static final long /*int*/ sel_setDefaultButtonCell_ = Selector.sel_setDefaultButtonCell_.value;
-public static final long /*int*/ sel_setDefaultFlatness_ = Selector.sel_setDefaultFlatness_.value;
-public static final long /*int*/ sel_setDefaultParagraphStyle_ = Selector.sel_setDefaultParagraphStyle_.value;
-public static final long /*int*/ sel_setDefaultTabInterval_ = Selector.sel_setDefaultTabInterval_.value;
-public static final long /*int*/ sel_setDelegate_ = Selector.sel_setDelegate_.value;
-public static final long /*int*/ sel_setDestination_allowOverwrite_ = Selector.sel_setDestination_allowOverwrite_.value;
-public static final long /*int*/ sel_setDictionary_ = Selector.sel_setDictionary_.value;
-public static final long /*int*/ sel_setDirectory_ = Selector.sel_setDirectory_.value;
-public static final long /*int*/ sel_setDirectoryURL_ = Selector.sel_setDirectoryURL_.value;
-public static final long /*int*/ sel_setDisplayMode_ = Selector.sel_setDisplayMode_.value;
-public static final long /*int*/ sel_setDisplaysLinkToolTips_ = Selector.sel_setDisplaysLinkToolTips_.value;
-public static final long /*int*/ sel_setDocumentCursor_ = Selector.sel_setDocumentCursor_.value;
-public static final long /*int*/ sel_setDocumentEdited_ = Selector.sel_setDocumentEdited_.value;
-public static final long /*int*/ sel_setDocumentView_ = Selector.sel_setDocumentView_.value;
-public static final long /*int*/ sel_setDoubleAction_ = Selector.sel_setDoubleAction_.value;
-public static final long /*int*/ sel_setDoubleValue_ = Selector.sel_setDoubleValue_.value;
-public static final long /*int*/ sel_setDownloadDelegate_ = Selector.sel_setDownloadDelegate_.value;
-public static final long /*int*/ sel_setDrawsBackground_ = Selector.sel_setDrawsBackground_.value;
-public static final long /*int*/ sel_setDropItem_dropChildIndex_ = Selector.sel_setDropItem_dropChildIndex_.value;
-public static final long /*int*/ sel_setDropRow_dropOperation_ = Selector.sel_setDropRow_dropOperation_.value;
-public static final long /*int*/ sel_setEditable_ = Selector.sel_setEditable_.value;
-public static final long /*int*/ sel_setEnabled_ = Selector.sel_setEnabled_.value;
-public static final long /*int*/ sel_setEnabled_forSegment_ = Selector.sel_setEnabled_forSegment_.value;
-public static final long /*int*/ sel_setFill = Selector.sel_setFill.value;
-public static final long /*int*/ sel_setFillColor_ = Selector.sel_setFillColor_.value;
-public static final long /*int*/ sel_setFireDate_ = Selector.sel_setFireDate_.value;
-public static final long /*int*/ sel_setFirstLineHeadIndent_ = Selector.sel_setFirstLineHeadIndent_.value;
-public static final long /*int*/ sel_setFloatingPanel_ = Selector.sel_setFloatingPanel_.value;
-public static final long /*int*/ sel_setFocusRingType_ = Selector.sel_setFocusRingType_.value;
-public static final long /*int*/ sel_setFont_ = Selector.sel_setFont_.value;
-public static final long /*int*/ sel_setFormatter_ = Selector.sel_setFormatter_.value;
-public static final long /*int*/ sel_setFrame_ = Selector.sel_setFrame_.value;
-public static final long /*int*/ sel_setFrame_display_ = Selector.sel_setFrame_display_.value;
-public static final long /*int*/ sel_setFrame_display_animate_ = Selector.sel_setFrame_display_animate_.value;
-public static final long /*int*/ sel_setFrameFromContentFrame_ = Selector.sel_setFrameFromContentFrame_.value;
-public static final long /*int*/ sel_setFrameLoadDelegate_ = Selector.sel_setFrameLoadDelegate_.value;
-public static final long /*int*/ sel_setFrameOrigin_ = Selector.sel_setFrameOrigin_.value;
-public static final long /*int*/ sel_setFrameSize_ = Selector.sel_setFrameSize_.value;
-public static final long /*int*/ sel_setGridStyleMask_ = Selector.sel_setGridStyleMask_.value;
-public static final long /*int*/ sel_setHTTPBody_ = Selector.sel_setHTTPBody_.value;
-public static final long /*int*/ sel_setHTTPMethod_ = Selector.sel_setHTTPMethod_.value;
-public static final long /*int*/ sel_setHasHorizontalScroller_ = Selector.sel_setHasHorizontalScroller_.value;
-public static final long /*int*/ sel_setHasShadow_ = Selector.sel_setHasShadow_.value;
-public static final long /*int*/ sel_setHasVerticalScroller_ = Selector.sel_setHasVerticalScroller_.value;
-public static final long /*int*/ sel_setHeadIndent_ = Selector.sel_setHeadIndent_.value;
-public static final long /*int*/ sel_setHeaderCell_ = Selector.sel_setHeaderCell_.value;
-public static final long /*int*/ sel_setHeaderView_ = Selector.sel_setHeaderView_.value;
-public static final long /*int*/ sel_setHelpMenu_ = Selector.sel_setHelpMenu_.value;
-public static final long /*int*/ sel_setHidden_ = Selector.sel_setHidden_.value;
-public static final long /*int*/ sel_setHiddenUntilMouseMoves_ = Selector.sel_setHiddenUntilMouseMoves_.value;
-public static final long /*int*/ sel_setHidesOnDeactivate_ = Selector.sel_setHidesOnDeactivate_.value;
-public static final long /*int*/ sel_setHighlightMode_ = Selector.sel_setHighlightMode_.value;
-public static final long /*int*/ sel_setHighlighted_ = Selector.sel_setHighlighted_.value;
-public static final long /*int*/ sel_setHighlightedTableColumn_ = Selector.sel_setHighlightedTableColumn_.value;
-public static final long /*int*/ sel_setHighlightsBy_ = Selector.sel_setHighlightsBy_.value;
-public static final long /*int*/ sel_setHorizontalScroller_ = Selector.sel_setHorizontalScroller_.value;
-public static final long /*int*/ sel_setHorizontallyResizable_ = Selector.sel_setHorizontallyResizable_.value;
-public static final long /*int*/ sel_setIcon_ = Selector.sel_setIcon_.value;
-public static final long /*int*/ sel_setIdentifier_ = Selector.sel_setIdentifier_.value;
-public static final long /*int*/ sel_setImage_ = Selector.sel_setImage_.value;
-public static final long /*int*/ sel_setImage_forSegment_ = Selector.sel_setImage_forSegment_.value;
-public static final long /*int*/ sel_setImageAlignment_ = Selector.sel_setImageAlignment_.value;
-public static final long /*int*/ sel_setImageInterpolation_ = Selector.sel_setImageInterpolation_.value;
-public static final long /*int*/ sel_setImagePosition_ = Selector.sel_setImagePosition_.value;
-public static final long /*int*/ sel_setImageScaling_ = Selector.sel_setImageScaling_.value;
-public static final long /*int*/ sel_setIncrement_ = Selector.sel_setIncrement_.value;
-public static final long /*int*/ sel_setIndeterminate_ = Selector.sel_setIndeterminate_.value;
-public static final long /*int*/ sel_setIndicatorImage_inTableColumn_ = Selector.sel_setIndicatorImage_inTableColumn_.value;
-public static final long /*int*/ sel_setInteger_forKey_ = Selector.sel_setInteger_forKey_.value;
-public static final long /*int*/ sel_setIntercellSpacing_ = Selector.sel_setIntercellSpacing_.value;
-public static final long /*int*/ sel_setJavaEnabled_ = Selector.sel_setJavaEnabled_.value;
-public static final long /*int*/ sel_setJavaScriptEnabled_ = Selector.sel_setJavaScriptEnabled_.value;
-public static final long /*int*/ sel_setJobDisposition_ = Selector.sel_setJobDisposition_.value;
-public static final long /*int*/ sel_setJobTitle_ = Selector.sel_setJobTitle_.value;
-public static final long /*int*/ sel_setKeyEquivalent_ = Selector.sel_setKeyEquivalent_.value;
-public static final long /*int*/ sel_setKeyEquivalentModifierMask_ = Selector.sel_setKeyEquivalentModifierMask_.value;
-public static final long /*int*/ sel_setKnobProportion_ = Selector.sel_setKnobProportion_.value;
-public static final long /*int*/ sel_setLabel_ = Selector.sel_setLabel_.value;
-public static final long /*int*/ sel_setLabel_forSegment_ = Selector.sel_setLabel_forSegment_.value;
-public static final long /*int*/ sel_setLeaf_ = Selector.sel_setLeaf_.value;
-public static final long /*int*/ sel_setLength_ = Selector.sel_setLength_.value;
-public static final long /*int*/ sel_setLevel_ = Selector.sel_setLevel_.value;
-public static final long /*int*/ sel_setLineBreakMode_ = Selector.sel_setLineBreakMode_.value;
-public static final long /*int*/ sel_setLineCapStyle_ = Selector.sel_setLineCapStyle_.value;
-public static final long /*int*/ sel_setLineDash_count_phase_ = Selector.sel_setLineDash_count_phase_.value;
-public static final long /*int*/ sel_setLineFragmentPadding_ = Selector.sel_setLineFragmentPadding_.value;
-public static final long /*int*/ sel_setLineFragmentRect_forGlyphRange_usedRect_ = Selector.sel_setLineFragmentRect_forGlyphRange_usedRect_.value;
-public static final long /*int*/ sel_setLineJoinStyle_ = Selector.sel_setLineJoinStyle_.value;
-public static final long /*int*/ sel_setLineSpacing_ = Selector.sel_setLineSpacing_.value;
-public static final long /*int*/ sel_setLineWidth_ = Selector.sel_setLineWidth_.value;
-public static final long /*int*/ sel_setLinkTextAttributes_ = Selector.sel_setLinkTextAttributes_.value;
-public static final long /*int*/ sel_setMainMenu_ = Selector.sel_setMainMenu_.value;
-public static final long /*int*/ sel_setMarkedText_selectedRange_ = Selector.sel_setMarkedText_selectedRange_.value;
-public static final long /*int*/ sel_setMaxSize_ = Selector.sel_setMaxSize_.value;
-public static final long /*int*/ sel_setMaxValue_ = Selector.sel_setMaxValue_.value;
-public static final long /*int*/ sel_setMaximum_ = Selector.sel_setMaximum_.value;
-public static final long /*int*/ sel_setMaximumFractionDigits_ = Selector.sel_setMaximumFractionDigits_.value;
-public static final long /*int*/ sel_setMaximumIntegerDigits_ = Selector.sel_setMaximumIntegerDigits_.value;
-public static final long /*int*/ sel_setMenu_ = Selector.sel_setMenu_.value;
-public static final long /*int*/ sel_setMenu_forSegment_ = Selector.sel_setMenu_forSegment_.value;
-public static final long /*int*/ sel_setMenuFormRepresentation_ = Selector.sel_setMenuFormRepresentation_.value;
-public static final long /*int*/ sel_setMessage_ = Selector.sel_setMessage_.value;
-public static final long /*int*/ sel_setMessageText_ = Selector.sel_setMessageText_.value;
-public static final long /*int*/ sel_setMinSize_ = Selector.sel_setMinSize_.value;
-public static final long /*int*/ sel_setMinValue_ = Selector.sel_setMinValue_.value;
-public static final long /*int*/ sel_setMinWidth_ = Selector.sel_setMinWidth_.value;
-public static final long /*int*/ sel_setMinimum_ = Selector.sel_setMinimum_.value;
-public static final long /*int*/ sel_setMinimumFractionDigits_ = Selector.sel_setMinimumFractionDigits_.value;
-public static final long /*int*/ sel_setMinimumIntegerDigits_ = Selector.sel_setMinimumIntegerDigits_.value;
-public static final long /*int*/ sel_setMiterLimit_ = Selector.sel_setMiterLimit_.value;
-public static final long /*int*/ sel_setMovable_ = Selector.sel_setMovable_.value;
-public static final long /*int*/ sel_setNameFieldStringValue_ = Selector.sel_setNameFieldStringValue_.value;
-public static final long /*int*/ sel_setNeedsDisplay_ = Selector.sel_setNeedsDisplay_.value;
-public static final long /*int*/ sel_setNeedsDisplayInRect_ = Selector.sel_setNeedsDisplayInRect_.value;
-public static final long /*int*/ sel_setNumberOfVisibleItems_ = Selector.sel_setNumberOfVisibleItems_.value;
-public static final long /*int*/ sel_setNumberStyle_ = Selector.sel_setNumberStyle_.value;
-public static final long /*int*/ sel_setObject_forKey_ = Selector.sel_setObject_forKey_.value;
-public static final long /*int*/ sel_setObjectValue_ = Selector.sel_setObjectValue_.value;
-public static final long /*int*/ sel_setOnMouseEntered_ = Selector.sel_setOnMouseEntered_.value;
-public static final long /*int*/ sel_setOpaque_ = Selector.sel_setOpaque_.value;
-public static final long /*int*/ sel_setOptions_ = Selector.sel_setOptions_.value;
-public static final long /*int*/ sel_setOutlineTableColumn_ = Selector.sel_setOutlineTableColumn_.value;
-public static final long /*int*/ sel_setPaletteLabel_ = Selector.sel_setPaletteLabel_.value;
-public static final long /*int*/ sel_setPanelFont_isMultiple_ = Selector.sel_setPanelFont_isMultiple_.value;
-public static final long /*int*/ sel_setPartialStringValidationEnabled_ = Selector.sel_setPartialStringValidationEnabled_.value;
-public static final long /*int*/ sel_setPatternPhase_ = Selector.sel_setPatternPhase_.value;
-public static final long /*int*/ sel_setPlaceholderString_ = Selector.sel_setPlaceholderString_.value;
-public static final long /*int*/ sel_setPolicyDelegate_ = Selector.sel_setPolicyDelegate_.value;
-public static final long /*int*/ sel_setPreferences_ = Selector.sel_setPreferences_.value;
-public static final long /*int*/ sel_setPrinter_ = Selector.sel_setPrinter_.value;
-public static final long /*int*/ sel_setPropertyList_forType_ = Selector.sel_setPropertyList_forType_.value;
-public static final long /*int*/ sel_setPullsDown_ = Selector.sel_setPullsDown_.value;
-public static final long /*int*/ sel_setReleasedWhenClosed_ = Selector.sel_setReleasedWhenClosed_.value;
-public static final long /*int*/ sel_setRepresentedFilename_ = Selector.sel_setRepresentedFilename_.value;
-public static final long /*int*/ sel_setRepresentedURL_ = Selector.sel_setRepresentedURL_.value;
-public static final long /*int*/ sel_setResizingMask_ = Selector.sel_setResizingMask_.value;
-public static final long /*int*/ sel_setResourceLoadDelegate_ = Selector.sel_setResourceLoadDelegate_.value;
-public static final long /*int*/ sel_setRichText_ = Selector.sel_setRichText_.value;
-public static final long /*int*/ sel_setRowHeight_ = Selector.sel_setRowHeight_.value;
-public static final long /*int*/ sel_setScalesWhenResized_ = Selector.sel_setScalesWhenResized_.value;
-public static final long /*int*/ sel_setScrollable_ = Selector.sel_setScrollable_.value;
-public static final long /*int*/ sel_setSearchButtonCell_ = Selector.sel_setSearchButtonCell_.value;
-public static final long /*int*/ sel_setSegmentCount_ = Selector.sel_setSegmentCount_.value;
-public static final long /*int*/ sel_setSegmentStyle_ = Selector.sel_setSegmentStyle_.value;
-public static final long /*int*/ sel_setSelectable_ = Selector.sel_setSelectable_.value;
-public static final long /*int*/ sel_setSelected_forSegment_ = Selector.sel_setSelected_forSegment_.value;
-public static final long /*int*/ sel_setSelectedItemIdentifier_ = Selector.sel_setSelectedItemIdentifier_.value;
-public static final long /*int*/ sel_setSelectedRange_ = Selector.sel_setSelectedRange_.value;
-public static final long /*int*/ sel_setSelectedSegment_ = Selector.sel_setSelectedSegment_.value;
-public static final long /*int*/ sel_setSelectedTextAttributes_ = Selector.sel_setSelectedTextAttributes_.value;
-public static final long /*int*/ sel_setSelectionOnly_ = Selector.sel_setSelectionOnly_.value;
-public static final long /*int*/ sel_setServicesMenu_ = Selector.sel_setServicesMenu_.value;
-public static final long /*int*/ sel_setShouldAntialias_ = Selector.sel_setShouldAntialias_.value;
-public static final long /*int*/ sel_setShowsHelp_ = Selector.sel_setShowsHelp_.value;
-public static final long /*int*/ sel_setShowsPrintPanel_ = Selector.sel_setShowsPrintPanel_.value;
-public static final long /*int*/ sel_setShowsProgressPanel_ = Selector.sel_setShowsProgressPanel_.value;
-public static final long /*int*/ sel_setShowsResizeIndicator_ = Selector.sel_setShowsResizeIndicator_.value;
-public static final long /*int*/ sel_setShowsToolbarButton_ = Selector.sel_setShowsToolbarButton_.value;
-public static final long /*int*/ sel_setSize_ = Selector.sel_setSize_.value;
-public static final long /*int*/ sel_setState_ = Selector.sel_setState_.value;
-public static final long /*int*/ sel_setString_ = Selector.sel_setString_.value;
-public static final long /*int*/ sel_setString_forType_ = Selector.sel_setString_forType_.value;
-public static final long /*int*/ sel_setStringValue_ = Selector.sel_setStringValue_.value;
-public static final long /*int*/ sel_setStroke = Selector.sel_setStroke.value;
-public static final long /*int*/ sel_setSubmenu_ = Selector.sel_setSubmenu_.value;
-public static final long /*int*/ sel_setSubmenu_forItem_ = Selector.sel_setSubmenu_forItem_.value;
-public static final long /*int*/ sel_setTabStops_ = Selector.sel_setTabStops_.value;
-public static final long /*int*/ sel_setTabViewType_ = Selector.sel_setTabViewType_.value;
-public static final long /*int*/ sel_setTag_ = Selector.sel_setTag_.value;
-public static final long /*int*/ sel_setTag_forSegment_ = Selector.sel_setTag_forSegment_.value;
-public static final long /*int*/ sel_setTarget_ = Selector.sel_setTarget_.value;
-public static final long /*int*/ sel_setTextColor_ = Selector.sel_setTextColor_.value;
-public static final long /*int*/ sel_setTextStorage_ = Selector.sel_setTextStorage_.value;
-public static final long /*int*/ sel_setTitle_ = Selector.sel_setTitle_.value;
-public static final long /*int*/ sel_setTitleFont_ = Selector.sel_setTitleFont_.value;
-public static final long /*int*/ sel_setTitlePosition_ = Selector.sel_setTitlePosition_.value;
-public static final long /*int*/ sel_setToolTip_ = Selector.sel_setToolTip_.value;
-public static final long /*int*/ sel_setToolTip_forSegment_ = Selector.sel_setToolTip_forSegment_.value;
-public static final long /*int*/ sel_setToolbar_ = Selector.sel_setToolbar_.value;
-public static final long /*int*/ sel_setTrackingMode_ = Selector.sel_setTrackingMode_.value;
-public static final long /*int*/ sel_setTransformStruct_ = Selector.sel_setTransformStruct_.value;
-public static final long /*int*/ sel_setTreatsFilePackagesAsDirectories_ = Selector.sel_setTreatsFilePackagesAsDirectories_.value;
-public static final long /*int*/ sel_setUIDelegate_ = Selector.sel_setUIDelegate_.value;
-public static final long /*int*/ sel_setURL_ = Selector.sel_setURL_.value;
-public static final long /*int*/ sel_setUpPrintOperationDefaultValues = Selector.sel_setUpPrintOperationDefaultValues.value;
-public static final long /*int*/ sel_setUsesAlternatingRowBackgroundColors_ = Selector.sel_setUsesAlternatingRowBackgroundColors_.value;
-public static final long /*int*/ sel_setUsesFontPanel_ = Selector.sel_setUsesFontPanel_.value;
-public static final long /*int*/ sel_setUsesScreenFonts_ = Selector.sel_setUsesScreenFonts_.value;
-public static final long /*int*/ sel_setUsesSingleLineMode_ = Selector.sel_setUsesSingleLineMode_.value;
-public static final long /*int*/ sel_setUsesThreadedAnimation_ = Selector.sel_setUsesThreadedAnimation_.value;
-public static final long /*int*/ sel_setValue_forHTTPHeaderField_ = Selector.sel_setValue_forHTTPHeaderField_.value;
-public static final long /*int*/ sel_setValue_forKey_ = Selector.sel_setValue_forKey_.value;
-public static final long /*int*/ sel_setValueWraps_ = Selector.sel_setValueWraps_.value;
-public static final long /*int*/ sel_setValues_forParameter_ = Selector.sel_setValues_forParameter_.value;
-public static final long /*int*/ sel_setVerticalScrollElasticity_ = Selector.sel_setVerticalScrollElasticity_.value;
-public static final long /*int*/ sel_setVerticalScroller_ = Selector.sel_setVerticalScroller_.value;
-public static final long /*int*/ sel_setView_ = Selector.sel_setView_.value;
-public static final long /*int*/ sel_setVisible_ = Selector.sel_setVisible_.value;
-public static final long /*int*/ sel_setWantsRestingTouches_ = Selector.sel_setWantsRestingTouches_.value;
-public static final long /*int*/ sel_setWidth_ = Selector.sel_setWidth_.value;
-public static final long /*int*/ sel_setWidth_forSegment_ = Selector.sel_setWidth_forSegment_.value;
-public static final long /*int*/ sel_setWidthTracksTextView_ = Selector.sel_setWidthTracksTextView_.value;
-public static final long /*int*/ sel_setWindingRule_ = Selector.sel_setWindingRule_.value;
-public static final long /*int*/ sel_setWorksWhenModal_ = Selector.sel_setWorksWhenModal_.value;
-public static final long /*int*/ sel_setWraps_ = Selector.sel_setWraps_.value;
-public static final long /*int*/ sel_sharedApplication = Selector.sel_sharedApplication.value;
-public static final long /*int*/ sel_sharedCertificateTrustPanel = Selector.sel_sharedCertificateTrustPanel.value;
-public static final long /*int*/ sel_sharedColorPanel = Selector.sel_sharedColorPanel.value;
-public static final long /*int*/ sel_sharedFontManager = Selector.sel_sharedFontManager.value;
-public static final long /*int*/ sel_sharedFontPanel = Selector.sel_sharedFontPanel.value;
-public static final long /*int*/ sel_sharedHTTPCookieStorage = Selector.sel_sharedHTTPCookieStorage.value;
-public static final long /*int*/ sel_sharedPrintInfo = Selector.sel_sharedPrintInfo.value;
-public static final long /*int*/ sel_sharedWorkspace = Selector.sel_sharedWorkspace.value;
-public static final long /*int*/ sel_shiftKey = Selector.sel_shiftKey.value;
-public static final long /*int*/ sel_shouldAntialias = Selector.sel_shouldAntialias.value;
-public static final long /*int*/ sel_shouldChangeTextInRange_replacementString_ = Selector.sel_shouldChangeTextInRange_replacementString_.value;
-public static final long /*int*/ sel_shouldDelayWindowOrderingForEvent_ = Selector.sel_shouldDelayWindowOrderingForEvent_.value;
-public static final long /*int*/ sel_shouldDrawInsertionPoint = Selector.sel_shouldDrawInsertionPoint.value;
-public static final long /*int*/ sel_size = Selector.sel_size.value;
-public static final long /*int*/ sel_sizeOfLabel_ = Selector.sel_sizeOfLabel_.value;
-public static final long /*int*/ sel_sizeToFit = Selector.sel_sizeToFit.value;
-public static final long /*int*/ sel_sizeValue = Selector.sel_sizeValue.value;
-public static final long /*int*/ sel_skipDescendents = Selector.sel_skipDescendents.value;
-public static final long /*int*/ sel_smallSystemFontSize = Selector.sel_smallSystemFontSize.value;
-public static final long /*int*/ sel_sortIndicatorRectForBounds_ = Selector.sel_sortIndicatorRectForBounds_.value;
-public static final long /*int*/ sel_standardPreferences = Selector.sel_standardPreferences.value;
-public static final long /*int*/ sel_standardUserDefaults = Selector.sel_standardUserDefaults.value;
-public static final long /*int*/ sel_standardWindowButton_ = Selector.sel_standardWindowButton_.value;
-public static final long /*int*/ sel_startAnimation_ = Selector.sel_startAnimation_.value;
-public static final long /*int*/ sel_state = Selector.sel_state.value;
-public static final long /*int*/ sel_statusItemWithLength_ = Selector.sel_statusItemWithLength_.value;
-public static final long /*int*/ sel_stop_ = Selector.sel_stop_.value;
-public static final long /*int*/ sel_stopAnimation_ = Selector.sel_stopAnimation_.value;
-public static final long /*int*/ sel_stopLoading_ = Selector.sel_stopLoading_.value;
-public static final long /*int*/ sel_stopModal = Selector.sel_stopModal.value;
-public static final long /*int*/ sel_string = Selector.sel_string.value;
-public static final long /*int*/ sel_stringByAddingPercentEscapesUsingEncoding_ = Selector.sel_stringByAddingPercentEscapesUsingEncoding_.value;
-public static final long /*int*/ sel_stringByAppendingPathComponent_ = Selector.sel_stringByAppendingPathComponent_.value;
-public static final long /*int*/ sel_stringByAppendingPathExtension_ = Selector.sel_stringByAppendingPathExtension_.value;
-public static final long /*int*/ sel_stringByAppendingString_ = Selector.sel_stringByAppendingString_.value;
-public static final long /*int*/ sel_stringByDeletingLastPathComponent = Selector.sel_stringByDeletingLastPathComponent.value;
-public static final long /*int*/ sel_stringByDeletingPathExtension = Selector.sel_stringByDeletingPathExtension.value;
-public static final long /*int*/ sel_stringByReplacingOccurrencesOfString_withString_ = Selector.sel_stringByReplacingOccurrencesOfString_withString_.value;
-public static final long /*int*/ sel_stringByReplacingPercentEscapesUsingEncoding_ = Selector.sel_stringByReplacingPercentEscapesUsingEncoding_.value;
-public static final long /*int*/ sel_stringForKey_ = Selector.sel_stringForKey_.value;
-public static final long /*int*/ sel_stringForObjectValue_ = Selector.sel_stringForObjectValue_.value;
-public static final long /*int*/ sel_stringForType_ = Selector.sel_stringForType_.value;
-public static final long /*int*/ sel_stringValue = Selector.sel_stringValue.value;
-public static final long /*int*/ sel_stringWithCharacters_length_ = Selector.sel_stringWithCharacters_length_.value;
-public static final long /*int*/ sel_stringWithUTF8String_ = Selector.sel_stringWithUTF8String_.value;
-public static final long /*int*/ sel_stroke = Selector.sel_stroke.value;
-public static final long /*int*/ sel_strokeRect_ = Selector.sel_strokeRect_.value;
-public static final long /*int*/ sel_styleMask = Selector.sel_styleMask.value;
-public static final long /*int*/ sel_submenu = Selector.sel_submenu.value;
-public static final long /*int*/ sel_subviews = Selector.sel_subviews.value;
-public static final long /*int*/ sel_superclass = Selector.sel_superclass.value;
-public static final long /*int*/ sel_superview = Selector.sel_superview.value;
-public static final long /*int*/ sel_swipeWithEvent_ = Selector.sel_swipeWithEvent_.value;
-public static final long /*int*/ sel_systemFontOfSize_ = Selector.sel_systemFontOfSize_.value;
-public static final long /*int*/ sel_systemFontSize = Selector.sel_systemFontSize.value;
-public static final long /*int*/ sel_systemFontSizeForControlSize_ = Selector.sel_systemFontSizeForControlSize_.value;
-public static final long /*int*/ sel_systemStatusBar = Selector.sel_systemStatusBar.value;
-public static final long /*int*/ sel_systemVersion = Selector.sel_systemVersion.value;
-public static final long /*int*/ sel_tabStopType = Selector.sel_tabStopType.value;
-public static final long /*int*/ sel_tabStops = Selector.sel_tabStops.value;
-public static final long /*int*/ sel_tabView_didSelectTabViewItem_ = Selector.sel_tabView_didSelectTabViewItem_.value;
-public static final long /*int*/ sel_tabView_shouldSelectTabViewItem_ = Selector.sel_tabView_shouldSelectTabViewItem_.value;
-public static final long /*int*/ sel_tabView_willSelectTabViewItem_ = Selector.sel_tabView_willSelectTabViewItem_.value;
-public static final long /*int*/ sel_tabViewItemAtPoint_ = Selector.sel_tabViewItemAtPoint_.value;
-public static final long /*int*/ sel_tableColumns = Selector.sel_tableColumns.value;
-public static final long /*int*/ sel_tableView_acceptDrop_row_dropOperation_ = Selector.sel_tableView_acceptDrop_row_dropOperation_.value;
-public static final long /*int*/ sel_tableView_didClickTableColumn_ = Selector.sel_tableView_didClickTableColumn_.value;
-public static final long /*int*/ sel_tableView_objectValueForTableColumn_row_ = Selector.sel_tableView_objectValueForTableColumn_row_.value;
-public static final long /*int*/ sel_tableView_setObjectValue_forTableColumn_row_ = Selector.sel_tableView_setObjectValue_forTableColumn_row_.value;
-public static final long /*int*/ sel_tableView_shouldEditTableColumn_row_ = Selector.sel_tableView_shouldEditTableColumn_row_.value;
-public static final long /*int*/ sel_tableView_shouldReorderColumn_toColumn_ = Selector.sel_tableView_shouldReorderColumn_toColumn_.value;
-public static final long /*int*/ sel_tableView_shouldSelectRow_ = Selector.sel_tableView_shouldSelectRow_.value;
-public static final long /*int*/ sel_tableView_shouldTrackCell_forTableColumn_row_ = Selector.sel_tableView_shouldTrackCell_forTableColumn_row_.value;
-public static final long /*int*/ sel_tableView_validateDrop_proposedRow_proposedDropOperation_ = Selector.sel_tableView_validateDrop_proposedRow_proposedDropOperation_.value;
-public static final long /*int*/ sel_tableView_willDisplayCell_forTableColumn_row_ = Selector.sel_tableView_willDisplayCell_forTableColumn_row_.value;
-public static final long /*int*/ sel_tableView_writeRowsWithIndexes_toPasteboard_ = Selector.sel_tableView_writeRowsWithIndexes_toPasteboard_.value;
-public static final long /*int*/ sel_tableViewColumnDidMove_ = Selector.sel_tableViewColumnDidMove_.value;
-public static final long /*int*/ sel_tableViewColumnDidResize_ = Selector.sel_tableViewColumnDidResize_.value;
-public static final long /*int*/ sel_tableViewSelectionDidChange_ = Selector.sel_tableViewSelectionDidChange_.value;
-public static final long /*int*/ sel_tableViewSelectionIsChanging_ = Selector.sel_tableViewSelectionIsChanging_.value;
-public static final long /*int*/ sel_tag = Selector.sel_tag.value;
-public static final long /*int*/ sel_target = Selector.sel_target.value;
-public static final long /*int*/ sel_terminate_ = Selector.sel_terminate_.value;
-public static final long /*int*/ sel_testPart_ = Selector.sel_testPart_.value;
-public static final long /*int*/ sel_textBackgroundColor = Selector.sel_textBackgroundColor.value;
-public static final long /*int*/ sel_textColor = Selector.sel_textColor.value;
-public static final long /*int*/ sel_textContainer = Selector.sel_textContainer.value;
-public static final long /*int*/ sel_textDidChange_ = Selector.sel_textDidChange_.value;
-public static final long /*int*/ sel_textDidEndEditing_ = Selector.sel_textDidEndEditing_.value;
-public static final long /*int*/ sel_textStorage = Selector.sel_textStorage.value;
-public static final long /*int*/ sel_textView_clickedOnLink_atIndex_ = Selector.sel_textView_clickedOnLink_atIndex_.value;
-public static final long /*int*/ sel_textView_willChangeSelectionFromCharacterRange_toCharacterRange_ = Selector.sel_textView_willChangeSelectionFromCharacterRange_toCharacterRange_.value;
-public static final long /*int*/ sel_textViewDidChangeSelection_ = Selector.sel_textViewDidChangeSelection_.value;
-public static final long /*int*/ sel_thickness = Selector.sel_thickness.value;
-public static final long /*int*/ sel_threadDictionary = Selector.sel_threadDictionary.value;
-public static final long /*int*/ sel_tile = Selector.sel_tile.value;
-public static final long /*int*/ sel_timeZone = Selector.sel_timeZone.value;
-public static final long /*int*/ sel_timestamp = Selector.sel_timestamp.value;
-public static final long /*int*/ sel_title = Selector.sel_title.value;
-public static final long /*int*/ sel_titleCell = Selector.sel_titleCell.value;
-public static final long /*int*/ sel_titleFont = Selector.sel_titleFont.value;
-public static final long /*int*/ sel_titleOfSelectedItem = Selector.sel_titleOfSelectedItem.value;
-public static final long /*int*/ sel_titleRectForBounds_ = Selector.sel_titleRectForBounds_.value;
-public static final long /*int*/ sel_toggleToolbarShown_ = Selector.sel_toggleToolbarShown_.value;
-public static final long /*int*/ sel_toolbar = Selector.sel_toolbar.value;
-public static final long /*int*/ sel_toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar_ = Selector.sel_toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar_.value;
-public static final long /*int*/ sel_toolbarAllowedItemIdentifiers_ = Selector.sel_toolbarAllowedItemIdentifiers_.value;
-public static final long /*int*/ sel_toolbarDefaultItemIdentifiers_ = Selector.sel_toolbarDefaultItemIdentifiers_.value;
-public static final long /*int*/ sel_toolbarDidRemoveItem_ = Selector.sel_toolbarDidRemoveItem_.value;
-public static final long /*int*/ sel_toolbarSelectableItemIdentifiers_ = Selector.sel_toolbarSelectableItemIdentifiers_.value;
-public static final long /*int*/ sel_toolbarWillAddItem_ = Selector.sel_toolbarWillAddItem_.value;
-public static final long /*int*/ sel_touchesBeganWithEvent_ = Selector.sel_touchesBeganWithEvent_.value;
-public static final long /*int*/ sel_touchesCancelledWithEvent_ = Selector.sel_touchesCancelledWithEvent_.value;
-public static final long /*int*/ sel_touchesEndedWithEvent_ = Selector.sel_touchesEndedWithEvent_.value;
-public static final long /*int*/ sel_touchesMatchingPhase_inView_ = Selector.sel_touchesMatchingPhase_inView_.value;
-public static final long /*int*/ sel_touchesMovedWithEvent_ = Selector.sel_touchesMovedWithEvent_.value;
-public static final long /*int*/ sel_trackingAreas = Selector.sel_trackingAreas.value;
-public static final long /*int*/ sel_traitsOfFont_ = Selector.sel_traitsOfFont_.value;
-public static final long /*int*/ sel_transform = Selector.sel_transform.value;
-public static final long /*int*/ sel_transformPoint_ = Selector.sel_transformPoint_.value;
-public static final long /*int*/ sel_transformSize_ = Selector.sel_transformSize_.value;
-public static final long /*int*/ sel_transformStruct = Selector.sel_transformStruct.value;
-public static final long /*int*/ sel_transformUsingAffineTransform_ = Selector.sel_transformUsingAffineTransform_.value;
-public static final long /*int*/ sel_translateXBy_yBy_ = Selector.sel_translateXBy_yBy_.value;
-public static final long /*int*/ sel_type = Selector.sel_type.value;
-public static final long /*int*/ sel_type_conformsToType_ = Selector.sel_type_conformsToType_.value;
-public static final long /*int*/ sel_typeOfFile_error_ = Selector.sel_typeOfFile_error_.value;
-public static final long /*int*/ sel_types = Selector.sel_types.value;
-public static final long /*int*/ sel_typesetter = Selector.sel_typesetter.value;
-public static final long /*int*/ sel_unarchiveObjectWithData_ = Selector.sel_unarchiveObjectWithData_.value;
-public static final long /*int*/ sel_undefined = Selector.sel_undefined.value;
-public static final long /*int*/ sel_undo = Selector.sel_undo.value;
-public static final long /*int*/ sel_undoManager = Selector.sel_undoManager.value;
-public static final long /*int*/ sel_unhideAllApplications_ = Selector.sel_unhideAllApplications_.value;
-public static final long /*int*/ sel_unlockFocus = Selector.sel_unlockFocus.value;
-public static final long /*int*/ sel_unmarkText = Selector.sel_unmarkText.value;
-public static final long /*int*/ sel_unregisterDraggedTypes = Selector.sel_unregisterDraggedTypes.value;
-public static final long /*int*/ sel_update = Selector.sel_update.value;
-public static final long /*int*/ sel_updateFromPMPrintSettings = Selector.sel_updateFromPMPrintSettings.value;
-public static final long /*int*/ sel_updateTrackingAreas = Selector.sel_updateTrackingAreas.value;
-public static final long /*int*/ sel_use = Selector.sel_use.value;
-public static final long /*int*/ sel_useCredential_forAuthenticationChallenge_ = Selector.sel_useCredential_forAuthenticationChallenge_.value;
-public static final long /*int*/ sel_usedRectForTextContainer_ = Selector.sel_usedRectForTextContainer_.value;
-public static final long /*int*/ sel_user = Selector.sel_user.value;
-public static final long /*int*/ sel_userInfo = Selector.sel_userInfo.value;
-public static final long /*int*/ sel_usesAlternatingRowBackgroundColors = Selector.sel_usesAlternatingRowBackgroundColors.value;
-public static final long /*int*/ sel_validAttributesForMarkedText = Selector.sel_validAttributesForMarkedText.value;
-public static final long /*int*/ sel_validModesForFontPanel_ = Selector.sel_validModesForFontPanel_.value;
-public static final long /*int*/ sel_validRequestorForSendType_returnType_ = Selector.sel_validRequestorForSendType_returnType_.value;
-public static final long /*int*/ sel_validateMenuItem_ = Selector.sel_validateMenuItem_.value;
-public static final long /*int*/ sel_validateVisibleColumns = Selector.sel_validateVisibleColumns.value;
-public static final long /*int*/ sel_value = Selector.sel_value.value;
-public static final long /*int*/ sel_valueForKey_ = Selector.sel_valueForKey_.value;
-public static final long /*int*/ sel_valueWithPoint_ = Selector.sel_valueWithPoint_.value;
-public static final long /*int*/ sel_valueWithRange_ = Selector.sel_valueWithRange_.value;
-public static final long /*int*/ sel_valueWithRect_ = Selector.sel_valueWithRect_.value;
-public static final long /*int*/ sel_valueWithSize_ = Selector.sel_valueWithSize_.value;
-public static final long /*int*/ sel_view = Selector.sel_view.value;
-public static final long /*int*/ sel_view_stringForToolTip_point_userData_ = Selector.sel_view_stringForToolTip_point_userData_.value;
-public static final long /*int*/ sel_viewDidMoveToWindow = Selector.sel_viewDidMoveToWindow.value;
-public static final long /*int*/ sel_viewWillMoveToWindow_ = Selector.sel_viewWillMoveToWindow_.value;
-public static final long /*int*/ sel_visibleFrame = Selector.sel_visibleFrame.value;
-public static final long /*int*/ sel_visibleRect = Selector.sel_visibleRect.value;
-public static final long /*int*/ sel_wantsPeriodicDraggingUpdates = Selector.sel_wantsPeriodicDraggingUpdates.value;
-public static final long /*int*/ sel_wantsToHandleMouseEvents = Selector.sel_wantsToHandleMouseEvents.value;
-public static final long /*int*/ sel_webFrame = Selector.sel_webFrame.value;
-public static final long /*int*/ sel_webScriptValueAtIndex_ = Selector.sel_webScriptValueAtIndex_.value;
-public static final long /*int*/ sel_webView_contextMenuItemsForElement_defaultMenuItems_ = Selector.sel_webView_contextMenuItemsForElement_defaultMenuItems_.value;
-public static final long /*int*/ sel_webView_createWebViewWithRequest_ = Selector.sel_webView_createWebViewWithRequest_.value;
-public static final long /*int*/ sel_webView_decidePolicyForMIMEType_request_frame_decisionListener_ = Selector.sel_webView_decidePolicyForMIMEType_request_frame_decisionListener_.value;
-public static final long /*int*/ sel_webView_decidePolicyForNavigationAction_request_frame_decisionListener_ = Selector.sel_webView_decidePolicyForNavigationAction_request_frame_decisionListener_.value;
-public static final long /*int*/ sel_webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener_ = Selector.sel_webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener_.value;
-public static final long /*int*/ sel_webView_didChangeLocationWithinPageForFrame_ = Selector.sel_webView_didChangeLocationWithinPageForFrame_.value;
-public static final long /*int*/ sel_webView_didCommitLoadForFrame_ = Selector.sel_webView_didCommitLoadForFrame_.value;
-public static final long /*int*/ sel_webView_didFailProvisionalLoadWithError_forFrame_ = Selector.sel_webView_didFailProvisionalLoadWithError_forFrame_.value;
-public static final long /*int*/ sel_webView_didFinishLoadForFrame_ = Selector.sel_webView_didFinishLoadForFrame_.value;
-public static final long /*int*/ sel_webView_didReceiveTitle_forFrame_ = Selector.sel_webView_didReceiveTitle_forFrame_.value;
-public static final long /*int*/ sel_webView_didStartProvisionalLoadForFrame_ = Selector.sel_webView_didStartProvisionalLoadForFrame_.value;
-public static final long /*int*/ sel_webView_identifierForInitialRequest_fromDataSource_ = Selector.sel_webView_identifierForInitialRequest_fromDataSource_.value;
-public static final long /*int*/ sel_webView_mouseDidMoveOverElement_modifierFlags_ = Selector.sel_webView_mouseDidMoveOverElement_modifierFlags_.value;
-public static final long /*int*/ sel_webView_printFrameView_ = Selector.sel_webView_printFrameView_.value;
-public static final long /*int*/ sel_webView_resource_didFailLoadingWithError_fromDataSource_ = Selector.sel_webView_resource_didFailLoadingWithError_fromDataSource_.value;
-public static final long /*int*/ sel_webView_resource_didFinishLoadingFromDataSource_ = Selector.sel_webView_resource_didFinishLoadingFromDataSource_.value;
-public static final long /*int*/ sel_webView_resource_didReceiveAuthenticationChallenge_fromDataSource_ = Selector.sel_webView_resource_didReceiveAuthenticationChallenge_fromDataSource_.value;
-public static final long /*int*/ sel_webView_resource_willSendRequest_redirectResponse_fromDataSource_ = Selector.sel_webView_resource_willSendRequest_redirectResponse_fromDataSource_.value;
-public static final long /*int*/ sel_webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame_ = Selector.sel_webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame_.value;
-public static final long /*int*/ sel_webView_runJavaScriptAlertPanelWithMessage_ = Selector.sel_webView_runJavaScriptAlertPanelWithMessage_.value;
-public static final long /*int*/ sel_webView_runJavaScriptAlertPanelWithMessage_initiatedByFrame_ = Selector.sel_webView_runJavaScriptAlertPanelWithMessage_initiatedByFrame_.value;
-public static final long /*int*/ sel_webView_runJavaScriptConfirmPanelWithMessage_ = Selector.sel_webView_runJavaScriptConfirmPanelWithMessage_.value;
-public static final long /*int*/ sel_webView_runJavaScriptConfirmPanelWithMessage_initiatedByFrame_ = Selector.sel_webView_runJavaScriptConfirmPanelWithMessage_initiatedByFrame_.value;
-public static final long /*int*/ sel_webView_runOpenPanelForFileButtonWithResultListener_ = Selector.sel_webView_runOpenPanelForFileButtonWithResultListener_.value;
-public static final long /*int*/ sel_webView_setFrame_ = Selector.sel_webView_setFrame_.value;
-public static final long /*int*/ sel_webView_setResizable_ = Selector.sel_webView_setResizable_.value;
-public static final long /*int*/ sel_webView_setStatusBarVisible_ = Selector.sel_webView_setStatusBarVisible_.value;
-public static final long /*int*/ sel_webView_setStatusText_ = Selector.sel_webView_setStatusText_.value;
-public static final long /*int*/ sel_webView_setToolbarsVisible_ = Selector.sel_webView_setToolbarsVisible_.value;
-public static final long /*int*/ sel_webView_unableToImplementPolicyWithError_frame_ = Selector.sel_webView_unableToImplementPolicyWithError_frame_.value;
-public static final long /*int*/ sel_webView_windowScriptObjectAvailable_ = Selector.sel_webView_windowScriptObjectAvailable_.value;
-public static final long /*int*/ sel_webViewClose_ = Selector.sel_webViewClose_.value;
-public static final long /*int*/ sel_webViewFocus_ = Selector.sel_webViewFocus_.value;
-public static final long /*int*/ sel_webViewShow_ = Selector.sel_webViewShow_.value;
-public static final long /*int*/ sel_webViewUnfocus_ = Selector.sel_webViewUnfocus_.value;
-public static final long /*int*/ sel_weightOfFont_ = Selector.sel_weightOfFont_.value;
-public static final long /*int*/ sel_wheelDelta = Selector.sel_wheelDelta.value;
-public static final long /*int*/ sel_wheelDeltaX = Selector.sel_wheelDeltaX.value;
-public static final long /*int*/ sel_wheelDeltaY = Selector.sel_wheelDeltaY.value;
-public static final long /*int*/ sel_width = Selector.sel_width.value;
-public static final long /*int*/ sel_window = Selector.sel_window.value;
-public static final long /*int*/ sel_windowBackgroundColor = Selector.sel_windowBackgroundColor.value;
-public static final long /*int*/ sel_windowDidBecomeKey_ = Selector.sel_windowDidBecomeKey_.value;
-public static final long /*int*/ sel_windowDidDeminiaturize_ = Selector.sel_windowDidDeminiaturize_.value;
-public static final long /*int*/ sel_windowDidMiniaturize_ = Selector.sel_windowDidMiniaturize_.value;
-public static final long /*int*/ sel_windowDidMove_ = Selector.sel_windowDidMove_.value;
-public static final long /*int*/ sel_windowDidResignKey_ = Selector.sel_windowDidResignKey_.value;
-public static final long /*int*/ sel_windowDidResize_ = Selector.sel_windowDidResize_.value;
-public static final long /*int*/ sel_windowFrameColor = Selector.sel_windowFrameColor.value;
-public static final long /*int*/ sel_windowFrameTextColor = Selector.sel_windowFrameTextColor.value;
-public static final long /*int*/ sel_windowNumber = Selector.sel_windowNumber.value;
-public static final long /*int*/ sel_windowNumberAtPoint_belowWindowWithWindowNumber_ = Selector.sel_windowNumberAtPoint_belowWindowWithWindowNumber_.value;
-public static final long /*int*/ sel_windowRef = Selector.sel_windowRef.value;
-public static final long /*int*/ sel_windowShouldClose_ = Selector.sel_windowShouldClose_.value;
-public static final long /*int*/ sel_windowWillClose_ = Selector.sel_windowWillClose_.value;
-public static final long /*int*/ sel_windowWithWindowNumber_ = Selector.sel_windowWithWindowNumber_.value;
-public static final long /*int*/ sel_windows = Selector.sel_windows.value;
-public static final long /*int*/ sel_worksWhenModal = Selector.sel_worksWhenModal.value;
-public static final long /*int*/ sel_wraps = Selector.sel_wraps.value;
-public static final long /*int*/ sel_writeObjects_ = Selector.sel_writeObjects_.value;
-public static final long /*int*/ sel_writeSelectionToPasteboard_types_ = Selector.sel_writeSelectionToPasteboard_types_.value;
-public static final long /*int*/ sel_yearOfCommonEra = Selector.sel_yearOfCommonEra.value;
-public static final long /*int*/ sel_zoom_ = Selector.sel_zoom_.value;
+public static final long sel_CGEvent = Selector.sel_CGEvent.value;
+public static final long sel_DOMDocument = Selector.sel_DOMDocument.value;
+public static final long sel_IBeamCursor = Selector.sel_IBeamCursor.value;
+public static final long sel_PMPrintSession = Selector.sel_PMPrintSession.value;
+public static final long sel_PMPrintSettings = Selector.sel_PMPrintSettings.value;
+public static final long sel_TIFFRepresentation = Selector.sel_TIFFRepresentation.value;
+public static final long sel_URL = Selector.sel_URL.value;
+public static final long sel_URLFromPasteboard_ = Selector.sel_URLFromPasteboard_.value;
+public static final long sel_URLWithString_ = Selector.sel_URLWithString_.value;
+public static final long sel_URLsForDirectory_inDomains_ = Selector.sel_URLsForDirectory_inDomains_.value;
+public static final long sel_UTF8String = Selector.sel_UTF8String.value;
+public static final long sel_abortEditing = Selector.sel_abortEditing.value;
+public static final long sel_absoluteString = Selector.sel_absoluteString.value;
+public static final long sel_acceptsFirstMouse_ = Selector.sel_acceptsFirstMouse_.value;
+public static final long sel_acceptsFirstResponder = Selector.sel_acceptsFirstResponder.value;
+public static final long sel_accessibilityActionDescription_ = Selector.sel_accessibilityActionDescription_.value;
+public static final long sel_accessibilityActionNames = Selector.sel_accessibilityActionNames.value;
+public static final long sel_accessibilityAttributeNames = Selector.sel_accessibilityAttributeNames.value;
+public static final long sel_accessibilityAttributeValue_ = Selector.sel_accessibilityAttributeValue_.value;
+public static final long sel_accessibilityAttributeValue_forParameter_ = Selector.sel_accessibilityAttributeValue_forParameter_.value;
+public static final long sel_accessibilityFocusedUIElement = Selector.sel_accessibilityFocusedUIElement.value;
+public static final long sel_accessibilityHitTest_ = Selector.sel_accessibilityHitTest_.value;
+public static final long sel_accessibilityIsAttributeSettable_ = Selector.sel_accessibilityIsAttributeSettable_.value;
+public static final long sel_accessibilityIsIgnored = Selector.sel_accessibilityIsIgnored.value;
+public static final long sel_accessibilityParameterizedAttributeNames = Selector.sel_accessibilityParameterizedAttributeNames.value;
+public static final long sel_accessibilityPerformAction_ = Selector.sel_accessibilityPerformAction_.value;
+public static final long sel_accessibilitySetOverrideValue_forAttribute_ = Selector.sel_accessibilitySetOverrideValue_forAttribute_.value;
+public static final long sel_accessibilitySetValue_forAttribute_ = Selector.sel_accessibilitySetValue_forAttribute_.value;
+public static final long sel_action = Selector.sel_action.value;
+public static final long sel_activateIgnoringOtherApps_ = Selector.sel_activateIgnoringOtherApps_.value;
+public static final long sel_activateWithOptions_ = Selector.sel_activateWithOptions_.value;
+public static final long sel_addAttribute_value_range_ = Selector.sel_addAttribute_value_range_.value;
+public static final long sel_addButtonWithTitle_ = Selector.sel_addButtonWithTitle_.value;
+public static final long sel_addChildWindow_ordered_ = Selector.sel_addChildWindow_ordered_.value;
+public static final long sel_addClip = Selector.sel_addClip.value;
+public static final long sel_addEventListener_listener_useCapture_ = Selector.sel_addEventListener_listener_useCapture_.value;
+public static final long sel_addIndex_ = Selector.sel_addIndex_.value;
+public static final long sel_addItem_ = Selector.sel_addItem_.value;
+public static final long sel_addItemWithObjectValue_ = Selector.sel_addItemWithObjectValue_.value;
+public static final long sel_addItemWithTitle_action_keyEquivalent_ = Selector.sel_addItemWithTitle_action_keyEquivalent_.value;
+public static final long sel_addLayoutManager_ = Selector.sel_addLayoutManager_.value;
+public static final long sel_addObject_ = Selector.sel_addObject_.value;
+public static final long sel_addObjectsFromArray_ = Selector.sel_addObjectsFromArray_.value;
+public static final long sel_addObserver_selector_name_object_ = Selector.sel_addObserver_selector_name_object_.value;
+public static final long sel_addRepresentation_ = Selector.sel_addRepresentation_.value;
+public static final long sel_addSubview_ = Selector.sel_addSubview_.value;
+public static final long sel_addSubview_positioned_relativeTo_ = Selector.sel_addSubview_positioned_relativeTo_.value;
+public static final long sel_addTabStop_ = Selector.sel_addTabStop_.value;
+public static final long sel_addTabViewItem_ = Selector.sel_addTabViewItem_.value;
+public static final long sel_addTableColumn_ = Selector.sel_addTableColumn_.value;
+public static final long sel_addTemporaryAttribute_value_forCharacterRange_ = Selector.sel_addTemporaryAttribute_value_forCharacterRange_.value;
+public static final long sel_addTextContainer_ = Selector.sel_addTextContainer_.value;
+public static final long sel_addTimer_forMode_ = Selector.sel_addTimer_forMode_.value;
+public static final long sel_addToolTipRect_owner_userData_ = Selector.sel_addToolTipRect_owner_userData_.value;
+public static final long sel_addTypes_owner_ = Selector.sel_addTypes_owner_.value;
+public static final long sel_alignment = Selector.sel_alignment.value;
+public static final long sel_allKeys = Selector.sel_allKeys.value;
+public static final long sel_allObjects = Selector.sel_allObjects.value;
+public static final long sel_alloc = Selector.sel_alloc.value;
+public static final long sel_allowsColumnReordering = Selector.sel_allowsColumnReordering.value;
+public static final long sel_allowsFloats = Selector.sel_allowsFloats.value;
+public static final long sel_alphaComponent = Selector.sel_alphaComponent.value;
+public static final long sel_alphaValue = Selector.sel_alphaValue.value;
+public static final long sel_altKey = Selector.sel_altKey.value;
+public static final long sel_alternateSelectedControlColor = Selector.sel_alternateSelectedControlColor.value;
+public static final long sel_alternateSelectedControlTextColor = Selector.sel_alternateSelectedControlTextColor.value;
+public static final long sel_alwaysShowsDecimalSeparator = Selector.sel_alwaysShowsDecimalSeparator.value;
+public static final long sel_appearanceNamed_ = Selector.sel_appearanceNamed_.value;
+public static final long sel_appendAttributedString_ = Selector.sel_appendAttributedString_.value;
+public static final long sel_appendBezierPath_ = Selector.sel_appendBezierPath_.value;
+public static final long sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_ = Selector.sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_.value;
+public static final long sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_ = Selector.sel_appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_.value;
+public static final long sel_appendBezierPathWithGlyphs_count_inFont_ = Selector.sel_appendBezierPathWithGlyphs_count_inFont_.value;
+public static final long sel_appendBezierPathWithOvalInRect_ = Selector.sel_appendBezierPathWithOvalInRect_.value;
+public static final long sel_appendBezierPathWithRect_ = Selector.sel_appendBezierPathWithRect_.value;
+public static final long sel_appendBezierPathWithRoundedRect_xRadius_yRadius_ = Selector.sel_appendBezierPathWithRoundedRect_xRadius_yRadius_.value;
+public static final long sel_appendString_ = Selector.sel_appendString_.value;
+public static final long sel_application_openFile_ = Selector.sel_application_openFile_.value;
+public static final long sel_application_openFiles_ = Selector.sel_application_openFiles_.value;
+public static final long sel_applicationDidBecomeActive_ = Selector.sel_applicationDidBecomeActive_.value;
+public static final long sel_applicationDidFinishLaunching_ = Selector.sel_applicationDidFinishLaunching_.value;
+public static final long sel_applicationDidResignActive_ = Selector.sel_applicationDidResignActive_.value;
+public static final long sel_applicationDockMenu_ = Selector.sel_applicationDockMenu_.value;
+public static final long sel_applicationIconImage = Selector.sel_applicationIconImage.value;
+public static final long sel_applicationShouldHandleReopen_hasVisibleWindows_ = Selector.sel_applicationShouldHandleReopen_hasVisibleWindows_.value;
+public static final long sel_applicationShouldTerminate_ = Selector.sel_applicationShouldTerminate_.value;
+public static final long sel_applicationWillFinishLaunching_ = Selector.sel_applicationWillFinishLaunching_.value;
+public static final long sel_applicationWillTerminate_ = Selector.sel_applicationWillTerminate_.value;
+public static final long sel_archivedDataWithRootObject_ = Selector.sel_archivedDataWithRootObject_.value;
+public static final long sel_areCursorRectsEnabled = Selector.sel_areCursorRectsEnabled.value;
+public static final long sel_arrangeInFront_ = Selector.sel_arrangeInFront_.value;
+public static final long sel_array = Selector.sel_array.value;
+public static final long sel_arrayWithCapacity_ = Selector.sel_arrayWithCapacity_.value;
+public static final long sel_arrayWithObject_ = Selector.sel_arrayWithObject_.value;
+public static final long sel_arrowCursor = Selector.sel_arrowCursor.value;
+public static final long sel_ascender = Selector.sel_ascender.value;
+public static final long sel_attachColorList_ = Selector.sel_attachColorList_.value;
+public static final long sel_attachment = Selector.sel_attachment.value;
+public static final long sel_attribute_atIndex_effectiveRange_ = Selector.sel_attribute_atIndex_effectiveRange_.value;
+public static final long sel_attributedStringValue = Selector.sel_attributedStringValue.value;
+public static final long sel_attributedStringWithAttachment_ = Selector.sel_attributedStringWithAttachment_.value;
+public static final long sel_attributedSubstringFromRange_ = Selector.sel_attributedSubstringFromRange_.value;
+public static final long sel_attributedTitle = Selector.sel_attributedTitle.value;
+public static final long sel_attributesAtIndex_longestEffectiveRange_inRange_ = Selector.sel_attributesAtIndex_longestEffectiveRange_inRange_.value;
+public static final long sel_autorelease = Selector.sel_autorelease.value;
+public static final long sel_availableFontFamilies = Selector.sel_availableFontFamilies.value;
+public static final long sel_availableFonts = Selector.sel_availableFonts.value;
+public static final long sel_availableMembersOfFontFamily_ = Selector.sel_availableMembersOfFontFamily_.value;
+public static final long sel_availableTypeFromArray_ = Selector.sel_availableTypeFromArray_.value;
+public static final long sel_backgroundColor = Selector.sel_backgroundColor.value;
+public static final long sel_backingScaleFactor = Selector.sel_backingScaleFactor.value;
+public static final long sel_badgeLabel = Selector.sel_badgeLabel.value;
+public static final long sel_baselineOffsetInLayoutManager_glyphIndex_ = Selector.sel_baselineOffsetInLayoutManager_glyphIndex_.value;
+public static final long sel_becomeFirstResponder = Selector.sel_becomeFirstResponder.value;
+public static final long sel_becomeKeyWindow = Selector.sel_becomeKeyWindow.value;
+public static final long sel_beginDocument = Selector.sel_beginDocument.value;
+public static final long sel_beginEditing = Selector.sel_beginEditing.value;
+public static final long sel_beginGestureWithEvent_ = Selector.sel_beginGestureWithEvent_.value;
+public static final long sel_beginPageInRect_atPlacement_ = Selector.sel_beginPageInRect_atPlacement_.value;
+public static final long sel_beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_ = Selector.sel_beginSheet_modalForWindow_modalDelegate_didEndSelector_contextInfo_.value;
+public static final long sel_beginSheetForWindow_modalDelegate_didEndSelector_contextInfo_trust_message_ = Selector.sel_beginSheetForWindow_modalDelegate_didEndSelector_contextInfo_trust_message_.value;
+public static final long sel_beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_ = Selector.sel_beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_.value;
+public static final long sel_beginSheetWithPrintInfo_modalForWindow_delegate_didEndSelector_contextInfo_ = Selector.sel_beginSheetWithPrintInfo_modalForWindow_delegate_didEndSelector_contextInfo_.value;
+public static final long sel_bestRepresentationForDevice_ = Selector.sel_bestRepresentationForDevice_.value;
+public static final long sel_bezelStyle = Selector.sel_bezelStyle.value;
+public static final long sel_bezierPath = Selector.sel_bezierPath.value;
+public static final long sel_bezierPathByFlatteningPath = Selector.sel_bezierPathByFlatteningPath.value;
+public static final long sel_bezierPathWithRect_ = Selector.sel_bezierPathWithRect_.value;
+public static final long sel_bezierPathWithRoundedRect_xRadius_yRadius_ = Selector.sel_bezierPathWithRoundedRect_xRadius_yRadius_.value;
+public static final long sel_bitmapData = Selector.sel_bitmapData.value;
+public static final long sel_bitmapFormat = Selector.sel_bitmapFormat.value;
+public static final long sel_bitmapImageRepForCachingDisplayInRect_ = Selector.sel_bitmapImageRepForCachingDisplayInRect_.value;
+public static final long sel_bitsPerPixel = Selector.sel_bitsPerPixel.value;
+public static final long sel_bitsPerSample = Selector.sel_bitsPerSample.value;
+public static final long sel_blackColor = Selector.sel_blackColor.value;
+public static final long sel_blueComponent = Selector.sel_blueComponent.value;
+public static final long sel_boldSystemFontOfSize_ = Selector.sel_boldSystemFontOfSize_.value;
+public static final long sel_boolValue = Selector.sel_boolValue.value;
+public static final long sel_borderWidth = Selector.sel_borderWidth.value;
+public static final long sel_boundingRectForGlyphRange_inTextContainer_ = Selector.sel_boundingRectForGlyphRange_inTextContainer_.value;
+public static final long sel_boundingRectWithSize_options_ = Selector.sel_boundingRectWithSize_options_.value;
+public static final long sel_bounds = Selector.sel_bounds.value;
+public static final long sel_bundleIdentifier = Selector.sel_bundleIdentifier.value;
+public static final long sel_bundlePath = Selector.sel_bundlePath.value;
+public static final long sel_bundleWithIdentifier_ = Selector.sel_bundleWithIdentifier_.value;
+public static final long sel_bundleWithPath_ = Selector.sel_bundleWithPath_.value;
+public static final long sel_button = Selector.sel_button.value;
+public static final long sel_buttonNumber = Selector.sel_buttonNumber.value;
+public static final long sel_bytes = Selector.sel_bytes.value;
+public static final long sel_bytesPerPlane = Selector.sel_bytesPerPlane.value;
+public static final long sel_bytesPerRow = Selector.sel_bytesPerRow.value;
+public static final long sel_cacheDisplayInRect_toBitmapImageRep_ = Selector.sel_cacheDisplayInRect_toBitmapImageRep_.value;
+public static final long sel_calendarDate = Selector.sel_calendarDate.value;
+public static final long sel_canBecomeKeyView = Selector.sel_canBecomeKeyView.value;
+public static final long sel_canBecomeKeyWindow = Selector.sel_canBecomeKeyWindow.value;
+public static final long sel_canDragRowsWithIndexes_atPoint_ = Selector.sel_canDragRowsWithIndexes_atPoint_.value;
+public static final long sel_canGoBack = Selector.sel_canGoBack.value;
+public static final long sel_canGoForward = Selector.sel_canGoForward.value;
+public static final long sel_canRedo = Selector.sel_canRedo.value;
+public static final long sel_canShowMIMEType_ = Selector.sel_canShowMIMEType_.value;
+public static final long sel_canUndo = Selector.sel_canUndo.value;
+public static final long sel_cancel = Selector.sel_cancel.value;
+public static final long sel_cancelAuthenticationChallenge_ = Selector.sel_cancelAuthenticationChallenge_.value;
+public static final long sel_cancelButtonCell = Selector.sel_cancelButtonCell.value;
+public static final long sel_cancelButtonRectForBounds_ = Selector.sel_cancelButtonRectForBounds_.value;
+public static final long sel_cancelOperation_ = Selector.sel_cancelOperation_.value;
+public static final long sel_cancelTracking = Selector.sel_cancelTracking.value;
+public static final long sel_cascadeTopLeftFromPoint_ = Selector.sel_cascadeTopLeftFromPoint_.value;
+public static final long sel_cell = Selector.sel_cell.value;
+public static final long sel_cellClass = Selector.sel_cellClass.value;
+public static final long sel_cellSize = Selector.sel_cellSize.value;
+public static final long sel_cellSizeForBounds_ = Selector.sel_cellSizeForBounds_.value;
+public static final long sel_changeColor_ = Selector.sel_changeColor_.value;
+public static final long sel_changeFont_ = Selector.sel_changeFont_.value;
+public static final long sel_charCode = Selector.sel_charCode.value;
+public static final long sel_characterAtIndex_ = Selector.sel_characterAtIndex_.value;
+public static final long sel_characterIndexForGlyphAtIndex_ = Selector.sel_characterIndexForGlyphAtIndex_.value;
+public static final long sel_characterIndexForInsertionAtPoint_ = Selector.sel_characterIndexForInsertionAtPoint_.value;
+public static final long sel_characterIndexForPoint_ = Selector.sel_characterIndexForPoint_.value;
+public static final long sel_characterIsMember_ = Selector.sel_characterIsMember_.value;
+public static final long sel_characters = Selector.sel_characters.value;
+public static final long sel_charactersIgnoringModifiers = Selector.sel_charactersIgnoringModifiers.value;
+public static final long sel_chooseFilename_ = Selector.sel_chooseFilename_.value;
+public static final long sel_className = Selector.sel_className.value;
+public static final long sel_cleanUpOperation = Selector.sel_cleanUpOperation.value;
+public static final long sel_clearColor = Selector.sel_clearColor.value;
+public static final long sel_clearCurrentContext = Selector.sel_clearCurrentContext.value;
+public static final long sel_clearDrawable = Selector.sel_clearDrawable.value;
+public static final long sel_clickCount = Selector.sel_clickCount.value;
+public static final long sel_clickedColumn = Selector.sel_clickedColumn.value;
+public static final long sel_clickedRow = Selector.sel_clickedRow.value;
+public static final long sel_close = Selector.sel_close.value;
+public static final long sel_closePath = Selector.sel_closePath.value;
+public static final long sel_code = Selector.sel_code.value;
+public static final long sel_collapseItem_ = Selector.sel_collapseItem_.value;
+public static final long sel_collapseItem_collapseChildren_ = Selector.sel_collapseItem_collapseChildren_.value;
+public static final long sel_collectionBehavior = Selector.sel_collectionBehavior.value;
+public static final long sel_color = Selector.sel_color.value;
+public static final long sel_colorAtX_y_ = Selector.sel_colorAtX_y_.value;
+public static final long sel_colorListNamed_ = Selector.sel_colorListNamed_.value;
+public static final long sel_colorSpace = Selector.sel_colorSpace.value;
+public static final long sel_colorSpaceModel = Selector.sel_colorSpaceModel.value;
+public static final long sel_colorSpaceName = Selector.sel_colorSpaceName.value;
+public static final long sel_colorUsingColorSpaceName_ = Selector.sel_colorUsingColorSpaceName_.value;
+public static final long sel_colorWithCalibratedRed_green_blue_alpha_ = Selector.sel_colorWithCalibratedRed_green_blue_alpha_.value;
+public static final long sel_colorWithDeviceRed_green_blue_alpha_ = Selector.sel_colorWithDeviceRed_green_blue_alpha_.value;
+public static final long sel_colorWithKey_ = Selector.sel_colorWithKey_.value;
+public static final long sel_colorWithPatternImage_ = Selector.sel_colorWithPatternImage_.value;
+public static final long sel_columnAtPoint_ = Selector.sel_columnAtPoint_.value;
+public static final long sel_columnIndexesInRect_ = Selector.sel_columnIndexesInRect_.value;
+public static final long sel_columnWithIdentifier_ = Selector.sel_columnWithIdentifier_.value;
+public static final long sel_comboBoxSelectionDidChange_ = Selector.sel_comboBoxSelectionDidChange_.value;
+public static final long sel_comboBoxWillDismiss_ = Selector.sel_comboBoxWillDismiss_.value;
+public static final long sel_comboBoxWillPopUp_ = Selector.sel_comboBoxWillPopUp_.value;
+public static final long sel_compare_ = Selector.sel_compare_.value;
+public static final long sel_concat = Selector.sel_concat.value;
+public static final long sel_conformsToProtocol_ = Selector.sel_conformsToProtocol_.value;
+public static final long sel_containerSize = Selector.sel_containerSize.value;
+public static final long sel_containsIndex_ = Selector.sel_containsIndex_.value;
+public static final long sel_containsObject_ = Selector.sel_containsObject_.value;
+public static final long sel_containsPoint_ = Selector.sel_containsPoint_.value;
+public static final long sel_contentRect = Selector.sel_contentRect.value;
+public static final long sel_contentSize = Selector.sel_contentSize.value;
+public static final long sel_contentSizeForFrameSize_hasHorizontalScroller_hasVerticalScroller_borderType_ = Selector.sel_contentSizeForFrameSize_hasHorizontalScroller_hasVerticalScroller_borderType_.value;
+public static final long sel_contentView = Selector.sel_contentView.value;
+public static final long sel_contentViewMargins = Selector.sel_contentViewMargins.value;
+public static final long sel_context = Selector.sel_context.value;
+public static final long sel_controlBackgroundColor = Selector.sel_controlBackgroundColor.value;
+public static final long sel_controlContentFontOfSize_ = Selector.sel_controlContentFontOfSize_.value;
+public static final long sel_controlDarkShadowColor = Selector.sel_controlDarkShadowColor.value;
+public static final long sel_controlHighlightColor = Selector.sel_controlHighlightColor.value;
+public static final long sel_controlLightHighlightColor = Selector.sel_controlLightHighlightColor.value;
+public static final long sel_controlPointBounds = Selector.sel_controlPointBounds.value;
+public static final long sel_controlShadowColor = Selector.sel_controlShadowColor.value;
+public static final long sel_controlSize = Selector.sel_controlSize.value;
+public static final long sel_controlTextColor = Selector.sel_controlTextColor.value;
+public static final long sel_convertBaseToScreen_ = Selector.sel_convertBaseToScreen_.value;
+public static final long sel_convertFont_toHaveTrait_ = Selector.sel_convertFont_toHaveTrait_.value;
+public static final long sel_convertPoint_fromView_ = Selector.sel_convertPoint_fromView_.value;
+public static final long sel_convertPoint_toView_ = Selector.sel_convertPoint_toView_.value;
+public static final long sel_convertPointFromBase_ = Selector.sel_convertPointFromBase_.value;
+public static final long sel_convertPointToBase_ = Selector.sel_convertPointToBase_.value;
+public static final long sel_convertRect_fromView_ = Selector.sel_convertRect_fromView_.value;
+public static final long sel_convertRect_toView_ = Selector.sel_convertRect_toView_.value;
+public static final long sel_convertRectFromBase_ = Selector.sel_convertRectFromBase_.value;
+public static final long sel_convertRectToBase_ = Selector.sel_convertRectToBase_.value;
+public static final long sel_convertScreenToBase_ = Selector.sel_convertScreenToBase_.value;
+public static final long sel_convertSize_fromView_ = Selector.sel_convertSize_fromView_.value;
+public static final long sel_convertSize_toView_ = Selector.sel_convertSize_toView_.value;
+public static final long sel_convertSizeFromBase_ = Selector.sel_convertSizeFromBase_.value;
+public static final long sel_convertSizeToBase_ = Selector.sel_convertSizeToBase_.value;
+public static final long sel_cookies = Selector.sel_cookies.value;
+public static final long sel_cookiesForURL_ = Selector.sel_cookiesForURL_.value;
+public static final long sel_cookiesWithResponseHeaderFields_forURL_ = Selector.sel_cookiesWithResponseHeaderFields_forURL_.value;
+public static final long sel_copiesOnScroll = Selector.sel_copiesOnScroll.value;
+public static final long sel_copy = Selector.sel_copy.value;
+public static final long sel_copy_ = Selector.sel_copy_.value;
+public static final long sel_count = Selector.sel_count.value;
+public static final long sel_createContext = Selector.sel_createContext.value;
+public static final long sel_createFileAtPath_contents_attributes_ = Selector.sel_createFileAtPath_contents_attributes_.value;
+public static final long sel_credentialWithUser_password_persistence_ = Selector.sel_credentialWithUser_password_persistence_.value;
+public static final long sel_crosshairCursor = Selector.sel_crosshairCursor.value;
+public static final long sel_ctrlKey = Selector.sel_ctrlKey.value;
+public static final long sel_currentAppearance = Selector.sel_currentAppearance.value;
+public static final long sel_currentApplication = Selector.sel_currentApplication.value;
+public static final long sel_currentContext = Selector.sel_currentContext.value;
+public static final long sel_currentCursor = Selector.sel_currentCursor.value;
+public static final long sel_currentEditor = Selector.sel_currentEditor.value;
+public static final long sel_currentEvent = Selector.sel_currentEvent.value;
+public static final long sel_currentInputManager = Selector.sel_currentInputManager.value;
+public static final long sel_currentPoint = Selector.sel_currentPoint.value;
+public static final long sel_currentRunLoop = Selector.sel_currentRunLoop.value;
+public static final long sel_currentThread = Selector.sel_currentThread.value;
+public static final long sel_cursorUpdate_ = Selector.sel_cursorUpdate_.value;
+public static final long sel_curveToPoint_controlPoint1_controlPoint2_ = Selector.sel_curveToPoint_controlPoint1_controlPoint2_.value;
+public static final long sel_cut_ = Selector.sel_cut_.value;
+public static final long sel_dataCell = Selector.sel_dataCell.value;
+public static final long sel_dataForType_ = Selector.sel_dataForType_.value;
+public static final long sel_dataSource = Selector.sel_dataSource.value;
+public static final long sel_dataWithBytes_length_ = Selector.sel_dataWithBytes_length_.value;
+public static final long sel_dateValue = Selector.sel_dateValue.value;
+public static final long sel_dateWithCalendarFormat_timeZone_ = Selector.sel_dateWithCalendarFormat_timeZone_.value;
+public static final long sel_dateWithTimeIntervalSinceNow_ = Selector.sel_dateWithTimeIntervalSinceNow_.value;
+public static final long sel_dateWithYear_month_day_hour_minute_second_timeZone_ = Selector.sel_dateWithYear_month_day_hour_minute_second_timeZone_.value;
+public static final long sel_dayOfMonth = Selector.sel_dayOfMonth.value;
+public static final long sel_dealloc = Selector.sel_dealloc.value;
+public static final long sel_decimalDigitCharacterSet = Selector.sel_decimalDigitCharacterSet.value;
+public static final long sel_decimalSeparator = Selector.sel_decimalSeparator.value;
+public static final long sel_declareTypes_owner_ = Selector.sel_declareTypes_owner_.value;
+public static final long sel_defaultBaselineOffsetForFont_ = Selector.sel_defaultBaselineOffsetForFont_.value;
+public static final long sel_defaultButtonCell = Selector.sel_defaultButtonCell.value;
+public static final long sel_defaultCenter = Selector.sel_defaultCenter.value;
+public static final long sel_defaultFlatness = Selector.sel_defaultFlatness.value;
+public static final long sel_defaultLineHeightForFont_ = Selector.sel_defaultLineHeightForFont_.value;
+public static final long sel_defaultManager = Selector.sel_defaultManager.value;
+public static final long sel_defaultParagraphStyle = Selector.sel_defaultParagraphStyle.value;
+public static final long sel_defaultPrinter = Selector.sel_defaultPrinter.value;
+public static final long sel_defaultTimeZone = Selector.sel_defaultTimeZone.value;
+public static final long sel_delegate = Selector.sel_delegate.value;
+public static final long sel_deleteCookie_ = Selector.sel_deleteCookie_.value;
+public static final long sel_deliverResult = Selector.sel_deliverResult.value;
+public static final long sel_deltaX = Selector.sel_deltaX.value;
+public static final long sel_deltaY = Selector.sel_deltaY.value;
+public static final long sel_deminiaturize_ = Selector.sel_deminiaturize_.value;
+public static final long sel_depth = Selector.sel_depth.value;
+public static final long sel_descender = Selector.sel_descender.value;
+public static final long sel_description = Selector.sel_description.value;
+public static final long sel_deselectAll_ = Selector.sel_deselectAll_.value;
+public static final long sel_deselectItemAtIndex_ = Selector.sel_deselectItemAtIndex_.value;
+public static final long sel_deselectRow_ = Selector.sel_deselectRow_.value;
+public static final long sel_destroyContext = Selector.sel_destroyContext.value;
+public static final long sel_detail = Selector.sel_detail.value;
+public static final long sel_device = Selector.sel_device.value;
+public static final long sel_deviceDescription = Selector.sel_deviceDescription.value;
+public static final long sel_deviceSize = Selector.sel_deviceSize.value;
+public static final long sel_dictionary = Selector.sel_dictionary.value;
+public static final long sel_dictionaryWithCapacity_ = Selector.sel_dictionaryWithCapacity_.value;
+public static final long sel_dictionaryWithObject_forKey_ = Selector.sel_dictionaryWithObject_forKey_.value;
+public static final long sel_disableCursorRects = Selector.sel_disableCursorRects.value;
+public static final long sel_disableFlushWindow = Selector.sel_disableFlushWindow.value;
+public static final long sel_disabledControlTextColor = Selector.sel_disabledControlTextColor.value;
+public static final long sel_discardCursorRects = Selector.sel_discardCursorRects.value;
+public static final long sel_display = Selector.sel_display.value;
+public static final long sel_displayIfNeeded = Selector.sel_displayIfNeeded.value;
+public static final long sel_displayName = Selector.sel_displayName.value;
+public static final long sel_displayNameForKey_value_ = Selector.sel_displayNameForKey_value_.value;
+public static final long sel_displayRectIgnoringOpacity_inContext_ = Selector.sel_displayRectIgnoringOpacity_inContext_.value;
+public static final long sel_distantFuture = Selector.sel_distantFuture.value;
+public static final long sel_doCommandBySelector_ = Selector.sel_doCommandBySelector_.value;
+public static final long sel_dockTile = Selector.sel_dockTile.value;
+public static final long sel_documentCursor = Selector.sel_documentCursor.value;
+public static final long sel_documentSource = Selector.sel_documentSource.value;
+public static final long sel_documentView = Selector.sel_documentView.value;
+public static final long sel_documentViewShouldHandlePrint = Selector.sel_documentViewShouldHandlePrint.value;
+public static final long sel_documentVisibleRect = Selector.sel_documentVisibleRect.value;
+public static final long sel_doubleClickAtIndex_ = Selector.sel_doubleClickAtIndex_.value;
+public static final long sel_doubleValue = Selector.sel_doubleValue.value;
+public static final long sel_download = Selector.sel_download.value;
+public static final long sel_download_decideDestinationWithSuggestedFilename_ = Selector.sel_download_decideDestinationWithSuggestedFilename_.value;
+public static final long sel_dragImage_at_offset_event_pasteboard_source_slideBack_ = Selector.sel_dragImage_at_offset_event_pasteboard_source_slideBack_.value;
+public static final long sel_dragImageForRowsWithIndexes_tableColumns_event_offset_ = Selector.sel_dragImageForRowsWithIndexes_tableColumns_event_offset_.value;
+public static final long sel_dragSelectionWithEvent_offset_slideBack_ = Selector.sel_dragSelectionWithEvent_offset_slideBack_.value;
+public static final long sel_draggedImage_beganAt_ = Selector.sel_draggedImage_beganAt_.value;
+public static final long sel_draggedImage_endedAt_operation_ = Selector.sel_draggedImage_endedAt_operation_.value;
+public static final long sel_draggingDestinationWindow = Selector.sel_draggingDestinationWindow.value;
+public static final long sel_draggingEnded_ = Selector.sel_draggingEnded_.value;
+public static final long sel_draggingEntered_ = Selector.sel_draggingEntered_.value;
+public static final long sel_draggingExited_ = Selector.sel_draggingExited_.value;
+public static final long sel_draggingLocation = Selector.sel_draggingLocation.value;
+public static final long sel_draggingPasteboard = Selector.sel_draggingPasteboard.value;
+public static final long sel_draggingSourceOperationMask = Selector.sel_draggingSourceOperationMask.value;
+public static final long sel_draggingSourceOperationMaskForLocal_ = Selector.sel_draggingSourceOperationMaskForLocal_.value;
+public static final long sel_draggingUpdated_ = Selector.sel_draggingUpdated_.value;
+public static final long sel_drawAtPoint_ = Selector.sel_drawAtPoint_.value;
+public static final long sel_drawAtPoint_fromRect_operation_fraction_ = Selector.sel_drawAtPoint_fromRect_operation_fraction_.value;
+public static final long sel_drawBackgroundForGlyphRange_atPoint_ = Selector.sel_drawBackgroundForGlyphRange_atPoint_.value;
+public static final long sel_drawBackgroundInClipRect_ = Selector.sel_drawBackgroundInClipRect_.value;
+public static final long sel_drawBezelWithFrame_inView_ = Selector.sel_drawBezelWithFrame_inView_.value;
+public static final long sel_drawFromPoint_toPoint_options_ = Selector.sel_drawFromPoint_toPoint_options_.value;
+public static final long sel_drawGlyphsForGlyphRange_atPoint_ = Selector.sel_drawGlyphsForGlyphRange_atPoint_.value;
+public static final long sel_drawImage_withFrame_inView_ = Selector.sel_drawImage_withFrame_inView_.value;
+public static final long sel_drawInBezierPath_angle_ = Selector.sel_drawInBezierPath_angle_.value;
+public static final long sel_drawInRect_ = Selector.sel_drawInRect_.value;
+public static final long sel_drawInRect_angle_ = Selector.sel_drawInRect_angle_.value;
+public static final long sel_drawInRect_fromRect_operation_fraction_ = Selector.sel_drawInRect_fromRect_operation_fraction_.value;
+public static final long sel_drawInteriorWithFrame_inView_ = Selector.sel_drawInteriorWithFrame_inView_.value;
+public static final long sel_drawLabel_inRect_ = Selector.sel_drawLabel_inRect_.value;
+public static final long sel_drawRect_ = Selector.sel_drawRect_.value;
+public static final long sel_drawSortIndicatorWithFrame_inView_ascending_priority_ = Selector.sel_drawSortIndicatorWithFrame_inView_ascending_priority_.value;
+public static final long sel_drawStatusBarBackgroundInRect_withHighlight_ = Selector.sel_drawStatusBarBackgroundInRect_withHighlight_.value;
+public static final long sel_drawTitle_withFrame_inView_ = Selector.sel_drawTitle_withFrame_inView_.value;
+public static final long sel_drawViewBackgroundInRect_ = Selector.sel_drawViewBackgroundInRect_.value;
+public static final long sel_drawWithExpansionFrame_inView_ = Selector.sel_drawWithExpansionFrame_inView_.value;
+public static final long sel_drawingRectForBounds_ = Selector.sel_drawingRectForBounds_.value;
+public static final long sel_elementAtIndex_associatedPoints_ = Selector.sel_elementAtIndex_associatedPoints_.value;
+public static final long sel_elementCount = Selector.sel_elementCount.value;
+public static final long sel_enableCursorRects = Selector.sel_enableCursorRects.value;
+public static final long sel_enableFlushWindow = Selector.sel_enableFlushWindow.value;
+public static final long sel_endDocument = Selector.sel_endDocument.value;
+public static final long sel_endEditing = Selector.sel_endEditing.value;
+public static final long sel_endEditingFor_ = Selector.sel_endEditingFor_.value;
+public static final long sel_endGestureWithEvent_ = Selector.sel_endGestureWithEvent_.value;
+public static final long sel_endPage = Selector.sel_endPage.value;
+public static final long sel_endSheet_returnCode_ = Selector.sel_endSheet_returnCode_.value;
+public static final long sel_enterExitEventWithType_location_modifierFlags_timestamp_windowNumber_context_eventNumber_trackingNumber_userData_ = Selector.sel_enterExitEventWithType_location_modifierFlags_timestamp_windowNumber_context_eventNumber_trackingNumber_userData_.value;
+public static final long sel_enumeratorAtPath_ = Selector.sel_enumeratorAtPath_.value;
+public static final long sel_expandItem_ = Selector.sel_expandItem_.value;
+public static final long sel_expandItem_expandChildren_ = Selector.sel_expandItem_expandChildren_.value;
+public static final long sel_expansionFrameWithFrame_inView_ = Selector.sel_expansionFrameWithFrame_inView_.value;
+public static final long sel_familyName = Selector.sel_familyName.value;
+public static final long sel_fieldEditor_forObject_ = Selector.sel_fieldEditor_forObject_.value;
+public static final long sel_fileExistsAtPath_ = Selector.sel_fileExistsAtPath_.value;
+public static final long sel_fileExistsAtPath_isDirectory_ = Selector.sel_fileExistsAtPath_isDirectory_.value;
+public static final long sel_fileSystemRepresentation = Selector.sel_fileSystemRepresentation.value;
+public static final long sel_fileURLWithPath_ = Selector.sel_fileURLWithPath_.value;
+public static final long sel_filename = Selector.sel_filename.value;
+public static final long sel_filenames = Selector.sel_filenames.value;
+public static final long sel_fill = Selector.sel_fill.value;
+public static final long sel_fillRect_ = Selector.sel_fillRect_.value;
+public static final long sel_finishLaunching = Selector.sel_finishLaunching.value;
+public static final long sel_firstIndex = Selector.sel_firstIndex.value;
+public static final long sel_firstRectForCharacterRange_ = Selector.sel_firstRectForCharacterRange_.value;
+public static final long sel_firstResponder = Selector.sel_firstResponder.value;
+public static final long sel_flagsChanged_ = Selector.sel_flagsChanged_.value;
+public static final long sel_floatValue = Selector.sel_floatValue.value;
+public static final long sel_flushBuffer = Selector.sel_flushBuffer.value;
+public static final long sel_flushGraphics = Selector.sel_flushGraphics.value;
+public static final long sel_flushWindowIfNeeded = Selector.sel_flushWindowIfNeeded.value;
+public static final long sel_focusRingMaskBoundsForFrame_inView_ = Selector.sel_focusRingMaskBoundsForFrame_inView_.value;
+public static final long sel_font = Selector.sel_font.value;
+public static final long sel_fontName = Selector.sel_fontName.value;
+public static final long sel_fontWithFamily_traits_weight_size_ = Selector.sel_fontWithFamily_traits_weight_size_.value;
+public static final long sel_fontWithName_size_ = Selector.sel_fontWithName_size_.value;
+public static final long sel_frame = Selector.sel_frame.value;
+public static final long sel_frameOfCellAtColumn_row_ = Selector.sel_frameOfCellAtColumn_row_.value;
+public static final long sel_frameOfOutlineCellAtRow_ = Selector.sel_frameOfOutlineCellAtRow_.value;
+public static final long sel_frameRectForContentRect_ = Selector.sel_frameRectForContentRect_.value;
+public static final long sel_frameSizeForContentSize_hasHorizontalScroller_hasVerticalScroller_borderType_ = Selector.sel_frameSizeForContentSize_hasHorizontalScroller_hasVerticalScroller_borderType_.value;
+public static final long sel_fullPathForApplication_ = Selector.sel_fullPathForApplication_.value;
+public static final long sel_generalPasteboard = Selector.sel_generalPasteboard.value;
+public static final long sel_genericRGBColorSpace = Selector.sel_genericRGBColorSpace.value;
+public static final long sel_getBitmapDataPlanes_ = Selector.sel_getBitmapDataPlanes_.value;
+public static final long sel_getBytes_ = Selector.sel_getBytes_.value;
+public static final long sel_getBytes_length_ = Selector.sel_getBytes_length_.value;
+public static final long sel_getCharacters_ = Selector.sel_getCharacters_.value;
+public static final long sel_getCharacters_range_ = Selector.sel_getCharacters_range_.value;
+public static final long sel_getComponents_ = Selector.sel_getComponents_.value;
+public static final long sel_getGlyphs_range_ = Selector.sel_getGlyphs_range_.value;
+public static final long sel_getGlyphsInRange_glyphs_characterIndexes_glyphInscriptions_elasticBits_bidiLevels_ = Selector.sel_getGlyphsInRange_glyphs_characterIndexes_glyphInscriptions_elasticBits_bidiLevels_.value;
+public static final long sel_getIndexes_maxCount_inIndexRange_ = Selector.sel_getIndexes_maxCount_inIndexRange_.value;
+public static final long sel_getInfoForFile_application_type_ = Selector.sel_getInfoForFile_application_type_.value;
+public static final long sel_getValues_forAttribute_forVirtualScreen_ = Selector.sel_getValues_forAttribute_forVirtualScreen_.value;
+public static final long sel_globalContext = Selector.sel_globalContext.value;
+public static final long sel_glyphIndexForCharacterAtIndex_ = Selector.sel_glyphIndexForCharacterAtIndex_.value;
+public static final long sel_glyphIndexForPoint_inTextContainer_fractionOfDistanceThroughGlyph_ = Selector.sel_glyphIndexForPoint_inTextContainer_fractionOfDistanceThroughGlyph_.value;
+public static final long sel_glyphRangeForCharacterRange_actualCharacterRange_ = Selector.sel_glyphRangeForCharacterRange_actualCharacterRange_.value;
+public static final long sel_glyphRangeForTextContainer_ = Selector.sel_glyphRangeForTextContainer_.value;
+public static final long sel_goBack = Selector.sel_goBack.value;
+public static final long sel_goForward = Selector.sel_goForward.value;
+public static final long sel_graphicsContext = Selector.sel_graphicsContext.value;
+public static final long sel_graphicsContextWithBitmapImageRep_ = Selector.sel_graphicsContextWithBitmapImageRep_.value;
+public static final long sel_graphicsContextWithGraphicsPort_flipped_ = Selector.sel_graphicsContextWithGraphicsPort_flipped_.value;
+public static final long sel_graphicsContextWithWindow_ = Selector.sel_graphicsContextWithWindow_.value;
+public static final long sel_graphicsPort = Selector.sel_graphicsPort.value;
+public static final long sel_greenComponent = Selector.sel_greenComponent.value;
+public static final long sel_handleEvent_ = Selector.sel_handleEvent_.value;
+public static final long sel_handleMouseEvent_ = Selector.sel_handleMouseEvent_.value;
+public static final long sel_hasAlpha = Selector.sel_hasAlpha.value;
+public static final long sel_hasMarkedText = Selector.sel_hasMarkedText.value;
+public static final long sel_hasPassword = Selector.sel_hasPassword.value;
+public static final long sel_hasShadow = Selector.sel_hasShadow.value;
+public static final long sel_headerCell = Selector.sel_headerCell.value;
+public static final long sel_headerRectOfColumn_ = Selector.sel_headerRectOfColumn_.value;
+public static final long sel_headerView = Selector.sel_headerView.value;
+public static final long sel_helpRequested_ = Selector.sel_helpRequested_.value;
+public static final long sel_hide_ = Selector.sel_hide_.value;
+public static final long sel_hideOtherApplications_ = Selector.sel_hideOtherApplications_.value;
+public static final long sel_highlightColorInView_ = Selector.sel_highlightColorInView_.value;
+public static final long sel_highlightColorWithFrame_inView_ = Selector.sel_highlightColorWithFrame_inView_.value;
+public static final long sel_highlightSelectionInClipRect_ = Selector.sel_highlightSelectionInClipRect_.value;
+public static final long sel_hitPart = Selector.sel_hitPart.value;
+public static final long sel_hitTest_ = Selector.sel_hitTest_.value;
+public static final long sel_hitTestForEvent_inRect_ofView_ = Selector.sel_hitTestForEvent_inRect_ofView_.value;
+public static final long sel_host = Selector.sel_host.value;
+public static final long sel_hotSpot = Selector.sel_hotSpot.value;
+public static final long sel_hourOfDay = Selector.sel_hourOfDay.value;
+public static final long sel_iconForFile_ = Selector.sel_iconForFile_.value;
+public static final long sel_iconForFileType_ = Selector.sel_iconForFileType_.value;
+public static final long sel_ignore = Selector.sel_ignore.value;
+public static final long sel_ignoreModifierKeysWhileDragging = Selector.sel_ignoreModifierKeysWhileDragging.value;
+public static final long sel_image = Selector.sel_image.value;
+public static final long sel_imageInterpolation = Selector.sel_imageInterpolation.value;
+public static final long sel_imageNamed_ = Selector.sel_imageNamed_.value;
+public static final long sel_imageRectForBounds_ = Selector.sel_imageRectForBounds_.value;
+public static final long sel_imageRepWithContentsOfFile_ = Selector.sel_imageRepWithContentsOfFile_.value;
+public static final long sel_imageRepWithData_ = Selector.sel_imageRepWithData_.value;
+public static final long sel_imageablePageBounds = Selector.sel_imageablePageBounds.value;
+public static final long sel_increment = Selector.sel_increment.value;
+public static final long sel_indentationPerLevel = Selector.sel_indentationPerLevel.value;
+public static final long sel_indexOfItemWithTarget_andAction_ = Selector.sel_indexOfItemWithTarget_andAction_.value;
+public static final long sel_indexOfObjectIdenticalTo_ = Selector.sel_indexOfObjectIdenticalTo_.value;
+public static final long sel_indexOfSelectedItem = Selector.sel_indexOfSelectedItem.value;
+public static final long sel_indexSetWithIndex_ = Selector.sel_indexSetWithIndex_.value;
+public static final long sel_infoDictionary = Selector.sel_infoDictionary.value;
+public static final long sel_init = Selector.sel_init.value;
+public static final long sel_initByReferencingFile_ = Selector.sel_initByReferencingFile_.value;
+public static final long sel_initListDescriptor = Selector.sel_initListDescriptor.value;
+public static final long sel_initWithAttributes_ = Selector.sel_initWithAttributes_.value;
+public static final long sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_ = Selector.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_.value;
+public static final long sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_ = Selector.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_.value;
+public static final long sel_initWithCapacity_ = Selector.sel_initWithCapacity_.value;
+public static final long sel_initWithCharacters_length_ = Selector.sel_initWithCharacters_length_.value;
+public static final long sel_initWithColors_ = Selector.sel_initWithColors_.value;
+public static final long sel_initWithContainerSize_ = Selector.sel_initWithContainerSize_.value;
+public static final long sel_initWithContentRect_styleMask_backing_defer_ = Selector.sel_initWithContentRect_styleMask_backing_defer_.value;
+public static final long sel_initWithContentRect_styleMask_backing_defer_screen_ = Selector.sel_initWithContentRect_styleMask_backing_defer_screen_.value;
+public static final long sel_initWithContentsOfFile_ = Selector.sel_initWithContentsOfFile_.value;
+public static final long sel_initWithData_ = Selector.sel_initWithData_.value;
+public static final long sel_initWithDictionary_ = Selector.sel_initWithDictionary_.value;
+public static final long sel_initWithFileWrapper_ = Selector.sel_initWithFileWrapper_.value;
+public static final long sel_initWithFocusedViewRect_ = Selector.sel_initWithFocusedViewRect_.value;
+public static final long sel_initWithFormat_shareContext_ = Selector.sel_initWithFormat_shareContext_.value;
+public static final long sel_initWithFrame_ = Selector.sel_initWithFrame_.value;
+public static final long sel_initWithFrame_frameName_groupName_ = Selector.sel_initWithFrame_frameName_groupName_.value;
+public static final long sel_initWithFrame_pullsDown_ = Selector.sel_initWithFrame_pullsDown_.value;
+public static final long sel_initWithIconRef_ = Selector.sel_initWithIconRef_.value;
+public static final long sel_initWithIdentifier_ = Selector.sel_initWithIdentifier_.value;
+public static final long sel_initWithImage_hotSpot_ = Selector.sel_initWithImage_hotSpot_.value;
+public static final long sel_initWithIndex_ = Selector.sel_initWithIndex_.value;
+public static final long sel_initWithIndexSet_ = Selector.sel_initWithIndexSet_.value;
+public static final long sel_initWithIndexesInRange_ = Selector.sel_initWithIndexesInRange_.value;
+public static final long sel_initWithItemIdentifier_ = Selector.sel_initWithItemIdentifier_.value;
+public static final long sel_initWithLocaleIdentifier_ = Selector.sel_initWithLocaleIdentifier_.value;
+public static final long sel_initWithName_ = Selector.sel_initWithName_.value;
+public static final long sel_initWithRect_options_owner_userInfo_ = Selector.sel_initWithRect_options_owner_userInfo_.value;
+public static final long sel_initWithSize_ = Selector.sel_initWithSize_.value;
+public static final long sel_initWithStartingColor_endingColor_ = Selector.sel_initWithStartingColor_endingColor_.value;
+public static final long sel_initWithString_ = Selector.sel_initWithString_.value;
+public static final long sel_initWithString_attributes_ = Selector.sel_initWithString_attributes_.value;
+public static final long sel_initWithTitle_ = Selector.sel_initWithTitle_.value;
+public static final long sel_initWithTitle_action_keyEquivalent_ = Selector.sel_initWithTitle_action_keyEquivalent_.value;
+public static final long sel_initWithTransform_ = Selector.sel_initWithTransform_.value;
+public static final long sel_initWithType_location_ = Selector.sel_initWithType_location_.value;
+public static final long sel_initWithURL_ = Selector.sel_initWithURL_.value;
+public static final long sel_insertColor_key_atIndex_ = Selector.sel_insertColor_key_atIndex_.value;
+public static final long sel_insertItem_atIndex_ = Selector.sel_insertItem_atIndex_.value;
+public static final long sel_insertItemWithItemIdentifier_atIndex_ = Selector.sel_insertItemWithItemIdentifier_atIndex_.value;
+public static final long sel_insertItemWithObjectValue_atIndex_ = Selector.sel_insertItemWithObjectValue_atIndex_.value;
+public static final long sel_insertTabViewItem_atIndex_ = Selector.sel_insertTabViewItem_atIndex_.value;
+public static final long sel_insertText_ = Selector.sel_insertText_.value;
+public static final long sel_intValue = Selector.sel_intValue.value;
+public static final long sel_integerValue = Selector.sel_integerValue.value;
+public static final long sel_intercellSpacing = Selector.sel_intercellSpacing.value;
+public static final long sel_interpretKeyEvents_ = Selector.sel_interpretKeyEvents_.value;
+public static final long sel_invalidate = Selector.sel_invalidate.value;
+public static final long sel_invalidateShadow = Selector.sel_invalidateShadow.value;
+public static final long sel_invert = Selector.sel_invert.value;
+public static final long sel_isActive = Selector.sel_isActive.value;
+public static final long sel_isDescendantOf_ = Selector.sel_isDescendantOf_.value;
+public static final long sel_isDocumentEdited = Selector.sel_isDocumentEdited.value;
+public static final long sel_isDrawingToScreen = Selector.sel_isDrawingToScreen.value;
+public static final long sel_isEmpty = Selector.sel_isEmpty.value;
+public static final long sel_isEnabled = Selector.sel_isEnabled.value;
+public static final long sel_isEqual_ = Selector.sel_isEqual_.value;
+public static final long sel_isEqualTo_ = Selector.sel_isEqualTo_.value;
+public static final long sel_isEqualToString_ = Selector.sel_isEqualToString_.value;
+public static final long sel_isExecutableFileAtPath_ = Selector.sel_isExecutableFileAtPath_.value;
+public static final long sel_isFieldEditor = Selector.sel_isFieldEditor.value;
+public static final long sel_isFilePackageAtPath_ = Selector.sel_isFilePackageAtPath_.value;
+public static final long sel_isFileURL = Selector.sel_isFileURL.value;
+public static final long sel_isFlipped = Selector.sel_isFlipped.value;
+public static final long sel_isHidden = Selector.sel_isHidden.value;
+public static final long sel_isHiddenOrHasHiddenAncestor = Selector.sel_isHiddenOrHasHiddenAncestor.value;
+public static final long sel_isHighlighted = Selector.sel_isHighlighted.value;
+public static final long sel_isItemExpanded_ = Selector.sel_isItemExpanded_.value;
+public static final long sel_isKeyWindow = Selector.sel_isKeyWindow.value;
+public static final long sel_isKindOfClass_ = Selector.sel_isKindOfClass_.value;
+public static final long sel_isMainThread = Selector.sel_isMainThread.value;
+public static final long sel_isMainWindow = Selector.sel_isMainWindow.value;
+public static final long sel_isMiniaturized = Selector.sel_isMiniaturized.value;
+public static final long sel_isOpaque = Selector.sel_isOpaque.value;
+public static final long sel_isPlanar = Selector.sel_isPlanar.value;
+public static final long sel_isResting = Selector.sel_isResting.value;
+public static final long sel_isRowSelected_ = Selector.sel_isRowSelected_.value;
+public static final long sel_isRunning = Selector.sel_isRunning.value;
+public static final long sel_isSelectionOnly = Selector.sel_isSelectionOnly.value;
+public static final long sel_isSeparatorItem = Selector.sel_isSeparatorItem.value;
+public static final long sel_isSessionOnly = Selector.sel_isSessionOnly.value;
+public static final long sel_isSheet = Selector.sel_isSheet.value;
+public static final long sel_isVisible = Selector.sel_isVisible.value;
+public static final long sel_isZoomed = Selector.sel_isZoomed.value;
+public static final long sel_itemArray = Selector.sel_itemArray.value;
+public static final long sel_itemAtIndex_ = Selector.sel_itemAtIndex_.value;
+public static final long sel_itemAtRow_ = Selector.sel_itemAtRow_.value;
+public static final long sel_itemHeight = Selector.sel_itemHeight.value;
+public static final long sel_itemIdentifier = Selector.sel_itemIdentifier.value;
+public static final long sel_itemObjectValueAtIndex_ = Selector.sel_itemObjectValueAtIndex_.value;
+public static final long sel_itemTitleAtIndex_ = Selector.sel_itemTitleAtIndex_.value;
+public static final long sel_itemWithTag_ = Selector.sel_itemWithTag_.value;
+public static final long sel_jobDisposition = Selector.sel_jobDisposition.value;
+public static final long sel_keyCode = Selector.sel_keyCode.value;
+public static final long sel_keyDown_ = Selector.sel_keyDown_.value;
+public static final long sel_keyEquivalent = Selector.sel_keyEquivalent.value;
+public static final long sel_keyEquivalentModifierMask = Selector.sel_keyEquivalentModifierMask.value;
+public static final long sel_keyUp_ = Selector.sel_keyUp_.value;
+public static final long sel_keyWindow = Selector.sel_keyWindow.value;
+public static final long sel_knobProportion = Selector.sel_knobProportion.value;
+public static final long sel_knobThickness = Selector.sel_knobThickness.value;
+public static final long sel_lastPathComponent = Selector.sel_lastPathComponent.value;
+public static final long sel_layoutManager = Selector.sel_layoutManager.value;
+public static final long sel_leading = Selector.sel_leading.value;
+public static final long sel_length = Selector.sel_length.value;
+public static final long sel_level = Selector.sel_level.value;
+public static final long sel_levelForItem_ = Selector.sel_levelForItem_.value;
+public static final long sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_ = Selector.sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_.value;
+public static final long sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_ = Selector.sel_lineFragmentUsedRectForGlyphAtIndex_effectiveRange_withoutAdditionalLayout_.value;
+public static final long sel_lineToPoint_ = Selector.sel_lineToPoint_.value;
+public static final long sel_linkTextAttributes = Selector.sel_linkTextAttributes.value;
+public static final long sel_loadHTMLString_baseURL_ = Selector.sel_loadHTMLString_baseURL_.value;
+public static final long sel_loadNibFile_externalNameTable_withZone_ = Selector.sel_loadNibFile_externalNameTable_withZone_.value;
+public static final long sel_loadRequest_ = Selector.sel_loadRequest_.value;
+public static final long sel_localizedDescription = Selector.sel_localizedDescription.value;
+public static final long sel_location = Selector.sel_location.value;
+public static final long sel_locationForGlyphAtIndex_ = Selector.sel_locationForGlyphAtIndex_.value;
+public static final long sel_locationInWindow = Selector.sel_locationInWindow.value;
+public static final long sel_lockFocus = Selector.sel_lockFocus.value;
+public static final long sel_lowercaseString = Selector.sel_lowercaseString.value;
+public static final long sel_magnification = Selector.sel_magnification.value;
+public static final long sel_magnifyWithEvent_ = Selector.sel_magnifyWithEvent_.value;
+public static final long sel_mainBundle = Selector.sel_mainBundle.value;
+public static final long sel_mainFrame = Selector.sel_mainFrame.value;
+public static final long sel_mainMenu = Selector.sel_mainMenu.value;
+public static final long sel_mainRunLoop = Selector.sel_mainRunLoop.value;
+public static final long sel_mainScreen = Selector.sel_mainScreen.value;
+public static final long sel_mainWindow = Selector.sel_mainWindow.value;
+public static final long sel_makeCurrentContext = Selector.sel_makeCurrentContext.value;
+public static final long sel_makeFirstResponder_ = Selector.sel_makeFirstResponder_.value;
+public static final long sel_makeKeyAndOrderFront_ = Selector.sel_makeKeyAndOrderFront_.value;
+public static final long sel_markedRange = Selector.sel_markedRange.value;
+public static final long sel_markedTextAttributes = Selector.sel_markedTextAttributes.value;
+public static final long sel_maxValue = Selector.sel_maxValue.value;
+public static final long sel_maximum = Selector.sel_maximum.value;
+public static final long sel_maximumFractionDigits = Selector.sel_maximumFractionDigits.value;
+public static final long sel_maximumIntegerDigits = Selector.sel_maximumIntegerDigits.value;
+public static final long sel_menu = Selector.sel_menu.value;
+public static final long sel_menu_willHighlightItem_ = Selector.sel_menu_willHighlightItem_.value;
+public static final long sel_menuBarFontOfSize_ = Selector.sel_menuBarFontOfSize_.value;
+public static final long sel_menuDidClose_ = Selector.sel_menuDidClose_.value;
+public static final long sel_menuFontOfSize_ = Selector.sel_menuFontOfSize_.value;
+public static final long sel_menuForEvent_ = Selector.sel_menuForEvent_.value;
+public static final long sel_menuNeedsUpdate_ = Selector.sel_menuNeedsUpdate_.value;
+public static final long sel_menuWillOpen_ = Selector.sel_menuWillOpen_.value;
+public static final long sel_metaKey = Selector.sel_metaKey.value;
+public static final long sel_minFrameWidthWithTitle_styleMask_ = Selector.sel_minFrameWidthWithTitle_styleMask_.value;
+public static final long sel_minSize = Selector.sel_minSize.value;
+public static final long sel_minValue = Selector.sel_minValue.value;
+public static final long sel_miniaturize_ = Selector.sel_miniaturize_.value;
+public static final long sel_minimum = Selector.sel_minimum.value;
+public static final long sel_minimumSize = Selector.sel_minimumSize.value;
+public static final long sel_minuteOfHour = Selector.sel_minuteOfHour.value;
+public static final long sel_modifierFlags = Selector.sel_modifierFlags.value;
+public static final long sel_monthOfYear = Selector.sel_monthOfYear.value;
+public static final long sel_mouse_inRect_ = Selector.sel_mouse_inRect_.value;
+public static final long sel_mouseDown_ = Selector.sel_mouseDown_.value;
+public static final long sel_mouseDownCanMoveWindow = Selector.sel_mouseDownCanMoveWindow.value;
+public static final long sel_mouseDragged_ = Selector.sel_mouseDragged_.value;
+public static final long sel_mouseEntered_ = Selector.sel_mouseEntered_.value;
+public static final long sel_mouseExited_ = Selector.sel_mouseExited_.value;
+public static final long sel_mouseLocation = Selector.sel_mouseLocation.value;
+public static final long sel_mouseLocationOutsideOfEventStream = Selector.sel_mouseLocationOutsideOfEventStream.value;
+public static final long sel_mouseMoved_ = Selector.sel_mouseMoved_.value;
+public static final long sel_mouseUp_ = Selector.sel_mouseUp_.value;
+public static final long sel_moveColumn_toColumn_ = Selector.sel_moveColumn_toColumn_.value;
+public static final long sel_moveToBeginningOfParagraph_ = Selector.sel_moveToBeginningOfParagraph_.value;
+public static final long sel_moveToEndOfParagraph_ = Selector.sel_moveToEndOfParagraph_.value;
+public static final long sel_moveToPoint_ = Selector.sel_moveToPoint_.value;
+public static final long sel_moveUp_ = Selector.sel_moveUp_.value;
+public static final long sel_mutableCopy = Selector.sel_mutableCopy.value;
+public static final long sel_mutableString = Selector.sel_mutableString.value;
+public static final long sel_name = Selector.sel_name.value;
+public static final long sel_needsPanelToBecomeKey = Selector.sel_needsPanelToBecomeKey.value;
+public static final long sel_nextEventMatchingMask_untilDate_inMode_dequeue_ = Selector.sel_nextEventMatchingMask_untilDate_inMode_dequeue_.value;
+public static final long sel_nextObject = Selector.sel_nextObject.value;
+public static final long sel_nextState = Selector.sel_nextState.value;
+public static final long sel_nextWordFromIndex_forward_ = Selector.sel_nextWordFromIndex_forward_.value;
+public static final long sel_noResponderFor_ = Selector.sel_noResponderFor_.value;
+public static final long sel_normalizedPosition = Selector.sel_normalizedPosition.value;
+public static final long sel_noteNumberOfRowsChanged = Selector.sel_noteNumberOfRowsChanged.value;
+public static final long sel_numberOfColumns = Selector.sel_numberOfColumns.value;
+public static final long sel_numberOfComponents = Selector.sel_numberOfComponents.value;
+public static final long sel_numberOfGlyphs = Selector.sel_numberOfGlyphs.value;
+public static final long sel_numberOfItems = Selector.sel_numberOfItems.value;
+public static final long sel_numberOfPlanes = Selector.sel_numberOfPlanes.value;
+public static final long sel_numberOfRows = Selector.sel_numberOfRows.value;
+public static final long sel_numberOfRowsInTableView_ = Selector.sel_numberOfRowsInTableView_.value;
+public static final long sel_numberOfSelectedRows = Selector.sel_numberOfSelectedRows.value;
+public static final long sel_numberOfVisibleItems = Selector.sel_numberOfVisibleItems.value;
+public static final long sel_numberWithBool_ = Selector.sel_numberWithBool_.value;
+public static final long sel_numberWithDouble_ = Selector.sel_numberWithDouble_.value;
+public static final long sel_numberWithInt_ = Selector.sel_numberWithInt_.value;
+public static final long sel_numberWithInteger_ = Selector.sel_numberWithInteger_.value;
+public static final long sel_objCType = Selector.sel_objCType.value;
+public static final long sel_object = Selector.sel_object.value;
+public static final long sel_objectAtIndex_ = Selector.sel_objectAtIndex_.value;
+public static final long sel_objectEnumerator = Selector.sel_objectEnumerator.value;
+public static final long sel_objectForInfoDictionaryKey_ = Selector.sel_objectForInfoDictionaryKey_.value;
+public static final long sel_objectForKey_ = Selector.sel_objectForKey_.value;
+public static final long sel_objectValues = Selector.sel_objectValues.value;
+public static final long sel_openFile_withApplication_ = Selector.sel_openFile_withApplication_.value;
+public static final long sel_openPanel = Selector.sel_openPanel.value;
+public static final long sel_openURL_ = Selector.sel_openURL_.value;
+public static final long sel_openURLs_withAppBundleIdentifier_options_additionalEventParamDescriptor_launchIdentifiers_ = Selector.sel_openURLs_withAppBundleIdentifier_options_additionalEventParamDescriptor_launchIdentifiers_.value;
+public static final long sel_operationNotAllowedCursor = Selector.sel_operationNotAllowedCursor.value;
+public static final long sel_options = Selector.sel_options.value;
+public static final long sel_orderBack_ = Selector.sel_orderBack_.value;
+public static final long sel_orderFront_ = Selector.sel_orderFront_.value;
+public static final long sel_orderFrontRegardless = Selector.sel_orderFrontRegardless.value;
+public static final long sel_orderFrontStandardAboutPanel_ = Selector.sel_orderFrontStandardAboutPanel_.value;
+public static final long sel_orderOut_ = Selector.sel_orderOut_.value;
+public static final long sel_orderWindow_relativeTo_ = Selector.sel_orderWindow_relativeTo_.value;
+public static final long sel_orderedWindows = Selector.sel_orderedWindows.value;
+public static final long sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_ = Selector.sel_otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2_.value;
+public static final long sel_otherMouseDown_ = Selector.sel_otherMouseDown_.value;
+public static final long sel_otherMouseDragged_ = Selector.sel_otherMouseDragged_.value;
+public static final long sel_otherMouseUp_ = Selector.sel_otherMouseUp_.value;
+public static final long sel_outlineTableColumn = Selector.sel_outlineTableColumn.value;
+public static final long sel_outlineView_acceptDrop_item_childIndex_ = Selector.sel_outlineView_acceptDrop_item_childIndex_.value;
+public static final long sel_outlineView_child_ofItem_ = Selector.sel_outlineView_child_ofItem_.value;
+public static final long sel_outlineView_didClickTableColumn_ = Selector.sel_outlineView_didClickTableColumn_.value;
+public static final long sel_outlineView_isItemExpandable_ = Selector.sel_outlineView_isItemExpandable_.value;
+public static final long sel_outlineView_numberOfChildrenOfItem_ = Selector.sel_outlineView_numberOfChildrenOfItem_.value;
+public static final long sel_outlineView_objectValueForTableColumn_byItem_ = Selector.sel_outlineView_objectValueForTableColumn_byItem_.value;
+public static final long sel_outlineView_setObjectValue_forTableColumn_byItem_ = Selector.sel_outlineView_setObjectValue_forTableColumn_byItem_.value;
+public static final long sel_outlineView_shouldCollapseItem_ = Selector.sel_outlineView_shouldCollapseItem_.value;
+public static final long sel_outlineView_shouldEditTableColumn_item_ = Selector.sel_outlineView_shouldEditTableColumn_item_.value;
+public static final long sel_outlineView_shouldExpandItem_ = Selector.sel_outlineView_shouldExpandItem_.value;
+public static final long sel_outlineView_shouldReorderColumn_toColumn_ = Selector.sel_outlineView_shouldReorderColumn_toColumn_.value;
+public static final long sel_outlineView_shouldSelectItem_ = Selector.sel_outlineView_shouldSelectItem_.value;
+public static final long sel_outlineView_shouldTrackCell_forTableColumn_item_ = Selector.sel_outlineView_shouldTrackCell_forTableColumn_item_.value;
+public static final long sel_outlineView_validateDrop_proposedItem_proposedChildIndex_ = Selector.sel_outlineView_validateDrop_proposedItem_proposedChildIndex_.value;
+public static final long sel_outlineView_willDisplayCell_forTableColumn_item_ = Selector.sel_outlineView_willDisplayCell_forTableColumn_item_.value;
+public static final long sel_outlineView_writeItems_toPasteboard_ = Selector.sel_outlineView_writeItems_toPasteboard_.value;
+public static final long sel_outlineViewColumnDidMove_ = Selector.sel_outlineViewColumnDidMove_.value;
+public static final long sel_outlineViewColumnDidResize_ = Selector.sel_outlineViewColumnDidResize_.value;
+public static final long sel_outlineViewItemDidExpand_ = Selector.sel_outlineViewItemDidExpand_.value;
+public static final long sel_outlineViewSelectionDidChange_ = Selector.sel_outlineViewSelectionDidChange_.value;
+public static final long sel_outlineViewSelectionIsChanging_ = Selector.sel_outlineViewSelectionIsChanging_.value;
+public static final long sel_owner = Selector.sel_owner.value;
+public static final long sel_pageDown_ = Selector.sel_pageDown_.value;
+public static final long sel_pageTitle = Selector.sel_pageTitle.value;
+public static final long sel_pageUp_ = Selector.sel_pageUp_.value;
+public static final long sel_panel_shouldShowFilename_ = Selector.sel_panel_shouldShowFilename_.value;
+public static final long sel_panelConvertFont_ = Selector.sel_panelConvertFont_.value;
+public static final long sel_paperSize = Selector.sel_paperSize.value;
+public static final long sel_paragraphs = Selector.sel_paragraphs.value;
+public static final long sel_parentWindow = Selector.sel_parentWindow.value;
+public static final long sel_password = Selector.sel_password.value;
+public static final long sel_paste_ = Selector.sel_paste_.value;
+public static final long sel_pasteboard_provideDataForType_ = Selector.sel_pasteboard_provideDataForType_.value;
+public static final long sel_pasteboardWithName_ = Selector.sel_pasteboardWithName_.value;
+public static final long sel_path = Selector.sel_path.value;
+public static final long sel_pathExtension = Selector.sel_pathExtension.value;
+public static final long sel_pathForResource_ofType_ = Selector.sel_pathForResource_ofType_.value;
+public static final long sel_pathForResource_ofType_inDirectory_forLocalization_ = Selector.sel_pathForResource_ofType_inDirectory_forLocalization_.value;
+public static final long sel_performDragOperation_ = Selector.sel_performDragOperation_.value;
+public static final long sel_performKeyEquivalent_ = Selector.sel_performKeyEquivalent_.value;
+public static final long sel_performSelector_withObject_afterDelay_inModes_ = Selector.sel_performSelector_withObject_afterDelay_inModes_.value;
+public static final long sel_performSelectorOnMainThread_withObject_waitUntilDone_ = Selector.sel_performSelectorOnMainThread_withObject_waitUntilDone_.value;
+public static final long sel_phase = Selector.sel_phase.value;
+public static final long sel_pixelsHigh = Selector.sel_pixelsHigh.value;
+public static final long sel_pixelsWide = Selector.sel_pixelsWide.value;
+public static final long sel_pointSize = Selector.sel_pointSize.value;
+public static final long sel_pointValue = Selector.sel_pointValue.value;
+public static final long sel_pointingHandCursor = Selector.sel_pointingHandCursor.value;
+public static final long sel_pop = Selector.sel_pop.value;
+public static final long sel_popUpContextMenu_withEvent_forView_ = Selector.sel_popUpContextMenu_withEvent_forView_.value;
+public static final long sel_popUpStatusItemMenu_ = Selector.sel_popUpStatusItemMenu_.value;
+public static final long sel_port = Selector.sel_port.value;
+public static final long sel_postEvent_atStart_ = Selector.sel_postEvent_atStart_.value;
+public static final long sel_preparedCellAtColumn_row_ = Selector.sel_preparedCellAtColumn_row_.value;
+public static final long sel_prependTransform_ = Selector.sel_prependTransform_.value;
+public static final long sel_preventDefault = Selector.sel_preventDefault.value;
+public static final long sel_previousFailureCount = Selector.sel_previousFailureCount.value;
+public static final long sel_printDocumentView = Selector.sel_printDocumentView.value;
+public static final long sel_printOperationWithPrintInfo_ = Selector.sel_printOperationWithPrintInfo_.value;
+public static final long sel_printOperationWithView_printInfo_ = Selector.sel_printOperationWithView_printInfo_.value;
+public static final long sel_printPanel = Selector.sel_printPanel.value;
+public static final long sel_printSettings = Selector.sel_printSettings.value;
+public static final long sel_printer = Selector.sel_printer.value;
+public static final long sel_printerNames = Selector.sel_printerNames.value;
+public static final long sel_printerWithName_ = Selector.sel_printerWithName_.value;
+public static final long sel_propertyListForType_ = Selector.sel_propertyListForType_.value;
+public static final long sel_proposedCredential = Selector.sel_proposedCredential.value;
+public static final long sel_protectionSpace = Selector.sel_protectionSpace.value;
+public static final long sel_push = Selector.sel_push.value;
+public static final long sel_rangeValue = Selector.sel_rangeValue.value;
+public static final long sel_readSelectionFromPasteboard_ = Selector.sel_readSelectionFromPasteboard_.value;
+public static final long sel_realm = Selector.sel_realm.value;
+public static final long sel_recentSearches = Selector.sel_recentSearches.value;
+public static final long sel_rectArrayForCharacterRange_withinSelectedCharacterRange_inTextContainer_rectCount_ = Selector.sel_rectArrayForCharacterRange_withinSelectedCharacterRange_inTextContainer_rectCount_.value;
+public static final long sel_rectArrayForGlyphRange_withinSelectedGlyphRange_inTextContainer_rectCount_ = Selector.sel_rectArrayForGlyphRange_withinSelectedGlyphRange_inTextContainer_rectCount_.value;
+public static final long sel_rectForPart_ = Selector.sel_rectForPart_.value;
+public static final long sel_rectOfColumn_ = Selector.sel_rectOfColumn_.value;
+public static final long sel_rectOfRow_ = Selector.sel_rectOfRow_.value;
+public static final long sel_rectValue = Selector.sel_rectValue.value;
+public static final long sel_redComponent = Selector.sel_redComponent.value;
+public static final long sel_redo = Selector.sel_redo.value;
+public static final long sel_reflectScrolledClipView_ = Selector.sel_reflectScrolledClipView_.value;
+public static final long sel_registerForDraggedTypes_ = Selector.sel_registerForDraggedTypes_.value;
+public static final long sel_release = Selector.sel_release.value;
+public static final long sel_reload_ = Selector.sel_reload_.value;
+public static final long sel_reloadData = Selector.sel_reloadData.value;
+public static final long sel_reloadItem_reloadChildren_ = Selector.sel_reloadItem_reloadChildren_.value;
+public static final long sel_removeAllItems = Selector.sel_removeAllItems.value;
+public static final long sel_removeAllPoints = Selector.sel_removeAllPoints.value;
+public static final long sel_removeAttribute_range_ = Selector.sel_removeAttribute_range_.value;
+public static final long sel_removeChildWindow_ = Selector.sel_removeChildWindow_.value;
+public static final long sel_removeColorWithKey_ = Selector.sel_removeColorWithKey_.value;
+public static final long sel_removeFromSuperview = Selector.sel_removeFromSuperview.value;
+public static final long sel_removeIndex_ = Selector.sel_removeIndex_.value;
+public static final long sel_removeItem_ = Selector.sel_removeItem_.value;
+public static final long sel_removeItemAtIndex_ = Selector.sel_removeItemAtIndex_.value;
+public static final long sel_removeItemAtPath_error_ = Selector.sel_removeItemAtPath_error_.value;
+public static final long sel_removeLastObject = Selector.sel_removeLastObject.value;
+public static final long sel_removeObject_ = Selector.sel_removeObject_.value;
+public static final long sel_removeObjectAtIndex_ = Selector.sel_removeObjectAtIndex_.value;
+public static final long sel_removeObjectForKey_ = Selector.sel_removeObjectForKey_.value;
+public static final long sel_removeObjectIdenticalTo_ = Selector.sel_removeObjectIdenticalTo_.value;
+public static final long sel_removeObserver_ = Selector.sel_removeObserver_.value;
+public static final long sel_removeObserver_name_object_ = Selector.sel_removeObserver_name_object_.value;
+public static final long sel_removeRepresentation_ = Selector.sel_removeRepresentation_.value;
+public static final long sel_removeStatusItem_ = Selector.sel_removeStatusItem_.value;
+public static final long sel_removeTabViewItem_ = Selector.sel_removeTabViewItem_.value;
+public static final long sel_removeTableColumn_ = Selector.sel_removeTableColumn_.value;
+public static final long sel_removeTemporaryAttribute_forCharacterRange_ = Selector.sel_removeTemporaryAttribute_forCharacterRange_.value;
+public static final long sel_removeToolTip_ = Selector.sel_removeToolTip_.value;
+public static final long sel_removeTrackingArea_ = Selector.sel_removeTrackingArea_.value;
+public static final long sel_replaceCharactersInRange_withString_ = Selector.sel_replaceCharactersInRange_withString_.value;
+public static final long sel_replyToOpenOrPrint_ = Selector.sel_replyToOpenOrPrint_.value;
+public static final long sel_representation = Selector.sel_representation.value;
+public static final long sel_representations = Selector.sel_representations.value;
+public static final long sel_request = Selector.sel_request.value;
+public static final long sel_requestWithURL_ = Selector.sel_requestWithURL_.value;
+public static final long sel_resetCursorRects = Selector.sel_resetCursorRects.value;
+public static final long sel_resignFirstResponder = Selector.sel_resignFirstResponder.value;
+public static final long sel_resizeDownCursor = Selector.sel_resizeDownCursor.value;
+public static final long sel_resizeLeftCursor = Selector.sel_resizeLeftCursor.value;
+public static final long sel_resizeLeftRightCursor = Selector.sel_resizeLeftRightCursor.value;
+public static final long sel_resizeRightCursor = Selector.sel_resizeRightCursor.value;
+public static final long sel_resizeUpCursor = Selector.sel_resizeUpCursor.value;
+public static final long sel_resizeUpDownCursor = Selector.sel_resizeUpDownCursor.value;
+public static final long sel_resizingMask = Selector.sel_resizingMask.value;
+public static final long sel_resourcePath = Selector.sel_resourcePath.value;
+public static final long sel_respondsToSelector_ = Selector.sel_respondsToSelector_.value;
+public static final long sel_restoreGraphicsState = Selector.sel_restoreGraphicsState.value;
+public static final long sel_retain = Selector.sel_retain.value;
+public static final long sel_retainCount = Selector.sel_retainCount.value;
+public static final long sel_rightMouseDown_ = Selector.sel_rightMouseDown_.value;
+public static final long sel_rightMouseDragged_ = Selector.sel_rightMouseDragged_.value;
+public static final long sel_rightMouseUp_ = Selector.sel_rightMouseUp_.value;
+public static final long sel_rotateByDegrees_ = Selector.sel_rotateByDegrees_.value;
+public static final long sel_rotateWithEvent_ = Selector.sel_rotateWithEvent_.value;
+public static final long sel_rotation = Selector.sel_rotation.value;
+public static final long sel_rowAtPoint_ = Selector.sel_rowAtPoint_.value;
+public static final long sel_rowForItem_ = Selector.sel_rowForItem_.value;
+public static final long sel_rowHeight = Selector.sel_rowHeight.value;
+public static final long sel_rowsInRect_ = Selector.sel_rowsInRect_.value;
+public static final long sel_run = Selector.sel_run.value;
+public static final long sel_runModal = Selector.sel_runModal.value;
+public static final long sel_runModalForDirectory_file_ = Selector.sel_runModalForDirectory_file_.value;
+public static final long sel_runModalForWindow_ = Selector.sel_runModalForWindow_.value;
+public static final long sel_runModalWithPrintInfo_ = Selector.sel_runModalWithPrintInfo_.value;
+public static final long sel_runMode_beforeDate_ = Selector.sel_runMode_beforeDate_.value;
+public static final long sel_runOperation = Selector.sel_runOperation.value;
+public static final long sel_samplesPerPixel = Selector.sel_samplesPerPixel.value;
+public static final long sel_saveGraphicsState = Selector.sel_saveGraphicsState.value;
+public static final long sel_savePanel = Selector.sel_savePanel.value;
+public static final long sel_scaleXBy_yBy_ = Selector.sel_scaleXBy_yBy_.value;
+public static final long sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_ = Selector.sel_scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_.value;
+public static final long sel_screen = Selector.sel_screen.value;
+public static final long sel_screenX = Selector.sel_screenX.value;
+public static final long sel_screenY = Selector.sel_screenY.value;
+public static final long sel_screens = Selector.sel_screens.value;
+public static final long sel_scrollClipView_toPoint_ = Selector.sel_scrollClipView_toPoint_.value;
+public static final long sel_scrollColumnToVisible_ = Selector.sel_scrollColumnToVisible_.value;
+public static final long sel_scrollPoint_ = Selector.sel_scrollPoint_.value;
+public static final long sel_scrollRangeToVisible_ = Selector.sel_scrollRangeToVisible_.value;
+public static final long sel_scrollRect_by_ = Selector.sel_scrollRect_by_.value;
+public static final long sel_scrollRectToVisible_ = Selector.sel_scrollRectToVisible_.value;
+public static final long sel_scrollRowToVisible_ = Selector.sel_scrollRowToVisible_.value;
+public static final long sel_scrollToPoint_ = Selector.sel_scrollToPoint_.value;
+public static final long sel_scrollWheel_ = Selector.sel_scrollWheel_.value;
+public static final long sel_scrollerWidth = Selector.sel_scrollerWidth.value;
+public static final long sel_scrollerWidthForControlSize_ = Selector.sel_scrollerWidthForControlSize_.value;
+public static final long sel_searchButtonCell = Selector.sel_searchButtonCell.value;
+public static final long sel_searchButtonRectForBounds_ = Selector.sel_searchButtonRectForBounds_.value;
+public static final long sel_searchTextRectForBounds_ = Selector.sel_searchTextRectForBounds_.value;
+public static final long sel_secondOfMinute = Selector.sel_secondOfMinute.value;
+public static final long sel_secondarySelectedControlColor = Selector.sel_secondarySelectedControlColor.value;
+public static final long sel_selectAll_ = Selector.sel_selectAll_.value;
+public static final long sel_selectItem_ = Selector.sel_selectItem_.value;
+public static final long sel_selectItemAtIndex_ = Selector.sel_selectItemAtIndex_.value;
+public static final long sel_selectRowIndexes_byExtendingSelection_ = Selector.sel_selectRowIndexes_byExtendingSelection_.value;
+public static final long sel_selectTabViewItemAtIndex_ = Selector.sel_selectTabViewItemAtIndex_.value;
+public static final long sel_selectText_ = Selector.sel_selectText_.value;
+public static final long sel_selectedControlColor = Selector.sel_selectedControlColor.value;
+public static final long sel_selectedControlTextColor = Selector.sel_selectedControlTextColor.value;
+public static final long sel_selectedRange = Selector.sel_selectedRange.value;
+public static final long sel_selectedRow = Selector.sel_selectedRow.value;
+public static final long sel_selectedRowIndexes = Selector.sel_selectedRowIndexes.value;
+public static final long sel_selectedTabViewItem = Selector.sel_selectedTabViewItem.value;
+public static final long sel_selectedTextAttributes = Selector.sel_selectedTextAttributes.value;
+public static final long sel_selectedTextBackgroundColor = Selector.sel_selectedTextBackgroundColor.value;
+public static final long sel_selectedTextColor = Selector.sel_selectedTextColor.value;
+public static final long sel_sendAction_to_ = Selector.sel_sendAction_to_.value;
+public static final long sel_sendAction_to_from_ = Selector.sel_sendAction_to_from_.value;
+public static final long sel_sendEvent_ = Selector.sel_sendEvent_.value;
+public static final long sel_sender = Selector.sel_sender.value;
+public static final long sel_separatorItem = Selector.sel_separatorItem.value;
+public static final long sel_set = Selector.sel_set.value;
+public static final long sel_setAcceptsMouseMovedEvents_ = Selector.sel_setAcceptsMouseMovedEvents_.value;
+public static final long sel_setAcceptsTouchEvents_ = Selector.sel_setAcceptsTouchEvents_.value;
+public static final long sel_setAccessoryView_ = Selector.sel_setAccessoryView_.value;
+public static final long sel_setAction_ = Selector.sel_setAction_.value;
+public static final long sel_setActivationPolicy_ = Selector.sel_setActivationPolicy_.value;
+public static final long sel_setAlertStyle_ = Selector.sel_setAlertStyle_.value;
+public static final long sel_setAlignment_ = Selector.sel_setAlignment_.value;
+public static final long sel_setAllowedFileTypes_ = Selector.sel_setAllowedFileTypes_.value;
+public static final long sel_setAllowsColumnReordering_ = Selector.sel_setAllowsColumnReordering_.value;
+public static final long sel_setAllowsFloats_ = Selector.sel_setAllowsFloats_.value;
+public static final long sel_setAllowsMixedState_ = Selector.sel_setAllowsMixedState_.value;
+public static final long sel_setAllowsMultipleSelection_ = Selector.sel_setAllowsMultipleSelection_.value;
+public static final long sel_setAllowsOtherFileTypes_ = Selector.sel_setAllowsOtherFileTypes_.value;
+public static final long sel_setAllowsUndo_ = Selector.sel_setAllowsUndo_.value;
+public static final long sel_setAllowsUserCustomization_ = Selector.sel_setAllowsUserCustomization_.value;
+public static final long sel_setAlpha_ = Selector.sel_setAlpha_.value;
+public static final long sel_setAlphaValue_ = Selector.sel_setAlphaValue_.value;
+public static final long sel_setAlternateButtonTitle_ = Selector.sel_setAlternateButtonTitle_.value;
+public static final long sel_setAppearance_ = Selector.sel_setAppearance_.value;
+public static final long sel_setApplicationIconImage_ = Selector.sel_setApplicationIconImage_.value;
+public static final long sel_setApplicationNameForUserAgent_ = Selector.sel_setApplicationNameForUserAgent_.value;
+public static final long sel_setAttachmentCell_ = Selector.sel_setAttachmentCell_.value;
+public static final long sel_setAttributedString_ = Selector.sel_setAttributedString_.value;
+public static final long sel_setAttributedStringValue_ = Selector.sel_setAttributedStringValue_.value;
+public static final long sel_setAttributedTitle_ = Selector.sel_setAttributedTitle_.value;
+public static final long sel_setAutoenablesItems_ = Selector.sel_setAutoenablesItems_.value;
+public static final long sel_setAutohidesScrollers_ = Selector.sel_setAutohidesScrollers_.value;
+public static final long sel_setAutoresizesOutlineColumn_ = Selector.sel_setAutoresizesOutlineColumn_.value;
+public static final long sel_setAutoresizesSubviews_ = Selector.sel_setAutoresizesSubviews_.value;
+public static final long sel_setAutoresizingMask_ = Selector.sel_setAutoresizingMask_.value;
+public static final long sel_setAutosaveExpandedItems_ = Selector.sel_setAutosaveExpandedItems_.value;
+public static final long sel_setBackgroundColor_ = Selector.sel_setBackgroundColor_.value;
+public static final long sel_setBackgroundLayoutEnabled_ = Selector.sel_setBackgroundLayoutEnabled_.value;
+public static final long sel_setBackgroundStyle_ = Selector.sel_setBackgroundStyle_.value;
+public static final long sel_setBadgeLabel_ = Selector.sel_setBadgeLabel_.value;
+public static final long sel_setBaseWritingDirection_ = Selector.sel_setBaseWritingDirection_.value;
+public static final long sel_setBaseWritingDirection_range_ = Selector.sel_setBaseWritingDirection_range_.value;
+public static final long sel_setBecomesKeyOnlyIfNeeded_ = Selector.sel_setBecomesKeyOnlyIfNeeded_.value;
+public static final long sel_setBezelStyle_ = Selector.sel_setBezelStyle_.value;
+public static final long sel_setBezeled_ = Selector.sel_setBezeled_.value;
+public static final long sel_setBorderType_ = Selector.sel_setBorderType_.value;
+public static final long sel_setBorderWidth_ = Selector.sel_setBorderWidth_.value;
+public static final long sel_setBordered_ = Selector.sel_setBordered_.value;
+public static final long sel_setBoundsRotation_ = Selector.sel_setBoundsRotation_.value;
+public static final long sel_setBoxType_ = Selector.sel_setBoxType_.value;
+public static final long sel_setButtonType_ = Selector.sel_setButtonType_.value;
+public static final long sel_setCacheMode_ = Selector.sel_setCacheMode_.value;
+public static final long sel_setCachePolicy_ = Selector.sel_setCachePolicy_.value;
+public static final long sel_setCanChooseDirectories_ = Selector.sel_setCanChooseDirectories_.value;
+public static final long sel_setCanChooseFiles_ = Selector.sel_setCanChooseFiles_.value;
+public static final long sel_setCanCreateDirectories_ = Selector.sel_setCanCreateDirectories_.value;
+public static final long sel_setCancelButtonCell_ = Selector.sel_setCancelButtonCell_.value;
+public static final long sel_setCell_ = Selector.sel_setCell_.value;
+public static final long sel_setCellClass_ = Selector.sel_setCellClass_.value;
+public static final long sel_setClip = Selector.sel_setClip.value;
+public static final long sel_setCollectionBehavior_ = Selector.sel_setCollectionBehavior_.value;
+public static final long sel_setColor_ = Selector.sel_setColor_.value;
+public static final long sel_setColumnAutoresizingStyle_ = Selector.sel_setColumnAutoresizingStyle_.value;
+public static final long sel_setCompositingOperation_ = Selector.sel_setCompositingOperation_.value;
+public static final long sel_setContainerSize_ = Selector.sel_setContainerSize_.value;
+public static final long sel_setContentView_ = Selector.sel_setContentView_.value;
+public static final long sel_setContentViewMargins_ = Selector.sel_setContentViewMargins_.value;
+public static final long sel_setControlSize_ = Selector.sel_setControlSize_.value;
+public static final long sel_setCookie_ = Selector.sel_setCookie_.value;
+public static final long sel_setCopiesOnScroll_ = Selector.sel_setCopiesOnScroll_.value;
+public static final long sel_setCurrentContext_ = Selector.sel_setCurrentContext_.value;
+public static final long sel_setCurrentOperation_ = Selector.sel_setCurrentOperation_.value;
+public static final long sel_setCustomUserAgent_ = Selector.sel_setCustomUserAgent_.value;
+public static final long sel_setData_forType_ = Selector.sel_setData_forType_.value;
+public static final long sel_setDataCell_ = Selector.sel_setDataCell_.value;
+public static final long sel_setDataSource_ = Selector.sel_setDataSource_.value;
+public static final long sel_setDatePickerElements_ = Selector.sel_setDatePickerElements_.value;
+public static final long sel_setDatePickerStyle_ = Selector.sel_setDatePickerStyle_.value;
+public static final long sel_setDateValue_ = Selector.sel_setDateValue_.value;
+public static final long sel_setDefaultButtonCell_ = Selector.sel_setDefaultButtonCell_.value;
+public static final long sel_setDefaultFlatness_ = Selector.sel_setDefaultFlatness_.value;
+public static final long sel_setDefaultParagraphStyle_ = Selector.sel_setDefaultParagraphStyle_.value;
+public static final long sel_setDefaultTabInterval_ = Selector.sel_setDefaultTabInterval_.value;
+public static final long sel_setDelegate_ = Selector.sel_setDelegate_.value;
+public static final long sel_setDestination_allowOverwrite_ = Selector.sel_setDestination_allowOverwrite_.value;
+public static final long sel_setDictionary_ = Selector.sel_setDictionary_.value;
+public static final long sel_setDirectory_ = Selector.sel_setDirectory_.value;
+public static final long sel_setDirectoryURL_ = Selector.sel_setDirectoryURL_.value;
+public static final long sel_setDisplayMode_ = Selector.sel_setDisplayMode_.value;
+public static final long sel_setDisplaysLinkToolTips_ = Selector.sel_setDisplaysLinkToolTips_.value;
+public static final long sel_setDocumentCursor_ = Selector.sel_setDocumentCursor_.value;
+public static final long sel_setDocumentEdited_ = Selector.sel_setDocumentEdited_.value;
+public static final long sel_setDocumentView_ = Selector.sel_setDocumentView_.value;
+public static final long sel_setDoubleAction_ = Selector.sel_setDoubleAction_.value;
+public static final long sel_setDoubleValue_ = Selector.sel_setDoubleValue_.value;
+public static final long sel_setDownloadDelegate_ = Selector.sel_setDownloadDelegate_.value;
+public static final long sel_setDrawsBackground_ = Selector.sel_setDrawsBackground_.value;
+public static final long sel_setDropItem_dropChildIndex_ = Selector.sel_setDropItem_dropChildIndex_.value;
+public static final long sel_setDropRow_dropOperation_ = Selector.sel_setDropRow_dropOperation_.value;
+public static final long sel_setEditable_ = Selector.sel_setEditable_.value;
+public static final long sel_setEnabled_ = Selector.sel_setEnabled_.value;
+public static final long sel_setEnabled_forSegment_ = Selector.sel_setEnabled_forSegment_.value;
+public static final long sel_setFill = Selector.sel_setFill.value;
+public static final long sel_setFillColor_ = Selector.sel_setFillColor_.value;
+public static final long sel_setFireDate_ = Selector.sel_setFireDate_.value;
+public static final long sel_setFirstLineHeadIndent_ = Selector.sel_setFirstLineHeadIndent_.value;
+public static final long sel_setFloatingPanel_ = Selector.sel_setFloatingPanel_.value;
+public static final long sel_setFocusRingType_ = Selector.sel_setFocusRingType_.value;
+public static final long sel_setFont_ = Selector.sel_setFont_.value;
+public static final long sel_setFormatter_ = Selector.sel_setFormatter_.value;
+public static final long sel_setFrame_ = Selector.sel_setFrame_.value;
+public static final long sel_setFrame_display_ = Selector.sel_setFrame_display_.value;
+public static final long sel_setFrame_display_animate_ = Selector.sel_setFrame_display_animate_.value;
+public static final long sel_setFrameFromContentFrame_ = Selector.sel_setFrameFromContentFrame_.value;
+public static final long sel_setFrameLoadDelegate_ = Selector.sel_setFrameLoadDelegate_.value;
+public static final long sel_setFrameOrigin_ = Selector.sel_setFrameOrigin_.value;
+public static final long sel_setFrameSize_ = Selector.sel_setFrameSize_.value;
+public static final long sel_setGridStyleMask_ = Selector.sel_setGridStyleMask_.value;
+public static final long sel_setHTTPBody_ = Selector.sel_setHTTPBody_.value;
+public static final long sel_setHTTPMethod_ = Selector.sel_setHTTPMethod_.value;
+public static final long sel_setHasHorizontalScroller_ = Selector.sel_setHasHorizontalScroller_.value;
+public static final long sel_setHasShadow_ = Selector.sel_setHasShadow_.value;
+public static final long sel_setHasVerticalScroller_ = Selector.sel_setHasVerticalScroller_.value;
+public static final long sel_setHeadIndent_ = Selector.sel_setHeadIndent_.value;
+public static final long sel_setHeaderCell_ = Selector.sel_setHeaderCell_.value;
+public static final long sel_setHeaderView_ = Selector.sel_setHeaderView_.value;
+public static final long sel_setHelpMenu_ = Selector.sel_setHelpMenu_.value;
+public static final long sel_setHidden_ = Selector.sel_setHidden_.value;
+public static final long sel_setHiddenUntilMouseMoves_ = Selector.sel_setHiddenUntilMouseMoves_.value;
+public static final long sel_setHidesOnDeactivate_ = Selector.sel_setHidesOnDeactivate_.value;
+public static final long sel_setHighlightMode_ = Selector.sel_setHighlightMode_.value;
+public static final long sel_setHighlighted_ = Selector.sel_setHighlighted_.value;
+public static final long sel_setHighlightedTableColumn_ = Selector.sel_setHighlightedTableColumn_.value;
+public static final long sel_setHighlightsBy_ = Selector.sel_setHighlightsBy_.value;
+public static final long sel_setHorizontalScroller_ = Selector.sel_setHorizontalScroller_.value;
+public static final long sel_setHorizontallyResizable_ = Selector.sel_setHorizontallyResizable_.value;
+public static final long sel_setIcon_ = Selector.sel_setIcon_.value;
+public static final long sel_setIdentifier_ = Selector.sel_setIdentifier_.value;
+public static final long sel_setImage_ = Selector.sel_setImage_.value;
+public static final long sel_setImage_forSegment_ = Selector.sel_setImage_forSegment_.value;
+public static final long sel_setImageAlignment_ = Selector.sel_setImageAlignment_.value;
+public static final long sel_setImageInterpolation_ = Selector.sel_setImageInterpolation_.value;
+public static final long sel_setImagePosition_ = Selector.sel_setImagePosition_.value;
+public static final long sel_setImageScaling_ = Selector.sel_setImageScaling_.value;
+public static final long sel_setIncrement_ = Selector.sel_setIncrement_.value;
+public static final long sel_setIndeterminate_ = Selector.sel_setIndeterminate_.value;
+public static final long sel_setIndicatorImage_inTableColumn_ = Selector.sel_setIndicatorImage_inTableColumn_.value;
+public static final long sel_setInteger_forKey_ = Selector.sel_setInteger_forKey_.value;
+public static final long sel_setIntercellSpacing_ = Selector.sel_setIntercellSpacing_.value;
+public static final long sel_setJavaEnabled_ = Selector.sel_setJavaEnabled_.value;
+public static final long sel_setJavaScriptEnabled_ = Selector.sel_setJavaScriptEnabled_.value;
+public static final long sel_setJobDisposition_ = Selector.sel_setJobDisposition_.value;
+public static final long sel_setJobTitle_ = Selector.sel_setJobTitle_.value;
+public static final long sel_setKeyEquivalent_ = Selector.sel_setKeyEquivalent_.value;
+public static final long sel_setKeyEquivalentModifierMask_ = Selector.sel_setKeyEquivalentModifierMask_.value;
+public static final long sel_setKnobProportion_ = Selector.sel_setKnobProportion_.value;
+public static final long sel_setLabel_ = Selector.sel_setLabel_.value;
+public static final long sel_setLabel_forSegment_ = Selector.sel_setLabel_forSegment_.value;
+public static final long sel_setLeaf_ = Selector.sel_setLeaf_.value;
+public static final long sel_setLength_ = Selector.sel_setLength_.value;
+public static final long sel_setLevel_ = Selector.sel_setLevel_.value;
+public static final long sel_setLineBreakMode_ = Selector.sel_setLineBreakMode_.value;
+public static final long sel_setLineCapStyle_ = Selector.sel_setLineCapStyle_.value;
+public static final long sel_setLineDash_count_phase_ = Selector.sel_setLineDash_count_phase_.value;
+public static final long sel_setLineFragmentPadding_ = Selector.sel_setLineFragmentPadding_.value;
+public static final long sel_setLineFragmentRect_forGlyphRange_usedRect_ = Selector.sel_setLineFragmentRect_forGlyphRange_usedRect_.value;
+public static final long sel_setLineJoinStyle_ = Selector.sel_setLineJoinStyle_.value;
+public static final long sel_setLineSpacing_ = Selector.sel_setLineSpacing_.value;
+public static final long sel_setLineWidth_ = Selector.sel_setLineWidth_.value;
+public static final long sel_setLinkTextAttributes_ = Selector.sel_setLinkTextAttributes_.value;
+public static final long sel_setMainMenu_ = Selector.sel_setMainMenu_.value;
+public static final long sel_setMarkedText_selectedRange_ = Selector.sel_setMarkedText_selectedRange_.value;
+public static final long sel_setMaxSize_ = Selector.sel_setMaxSize_.value;
+public static final long sel_setMaxValue_ = Selector.sel_setMaxValue_.value;
+public static final long sel_setMaximum_ = Selector.sel_setMaximum_.value;
+public static final long sel_setMaximumFractionDigits_ = Selector.sel_setMaximumFractionDigits_.value;
+public static final long sel_setMaximumIntegerDigits_ = Selector.sel_setMaximumIntegerDigits_.value;
+public static final long sel_setMenu_ = Selector.sel_setMenu_.value;
+public static final long sel_setMenu_forSegment_ = Selector.sel_setMenu_forSegment_.value;
+public static final long sel_setMenuFormRepresentation_ = Selector.sel_setMenuFormRepresentation_.value;
+public static final long sel_setMessage_ = Selector.sel_setMessage_.value;
+public static final long sel_setMessageText_ = Selector.sel_setMessageText_.value;
+public static final long sel_setMinSize_ = Selector.sel_setMinSize_.value;
+public static final long sel_setMinValue_ = Selector.sel_setMinValue_.value;
+public static final long sel_setMinWidth_ = Selector.sel_setMinWidth_.value;
+public static final long sel_setMinimum_ = Selector.sel_setMinimum_.value;
+public static final long sel_setMinimumFractionDigits_ = Selector.sel_setMinimumFractionDigits_.value;
+public static final long sel_setMinimumIntegerDigits_ = Selector.sel_setMinimumIntegerDigits_.value;
+public static final long sel_setMiterLimit_ = Selector.sel_setMiterLimit_.value;
+public static final long sel_setMovable_ = Selector.sel_setMovable_.value;
+public static final long sel_setNameFieldStringValue_ = Selector.sel_setNameFieldStringValue_.value;
+public static final long sel_setNeedsDisplay_ = Selector.sel_setNeedsDisplay_.value;
+public static final long sel_setNeedsDisplayInRect_ = Selector.sel_setNeedsDisplayInRect_.value;
+public static final long sel_setNumberOfVisibleItems_ = Selector.sel_setNumberOfVisibleItems_.value;
+public static final long sel_setNumberStyle_ = Selector.sel_setNumberStyle_.value;
+public static final long sel_setObject_forKey_ = Selector.sel_setObject_forKey_.value;
+public static final long sel_setObjectValue_ = Selector.sel_setObjectValue_.value;
+public static final long sel_setOnMouseEntered_ = Selector.sel_setOnMouseEntered_.value;
+public static final long sel_setOpaque_ = Selector.sel_setOpaque_.value;
+public static final long sel_setOptions_ = Selector.sel_setOptions_.value;
+public static final long sel_setOutlineTableColumn_ = Selector.sel_setOutlineTableColumn_.value;
+public static final long sel_setPaletteLabel_ = Selector.sel_setPaletteLabel_.value;
+public static final long sel_setPanelFont_isMultiple_ = Selector.sel_setPanelFont_isMultiple_.value;
+public static final long sel_setPartialStringValidationEnabled_ = Selector.sel_setPartialStringValidationEnabled_.value;
+public static final long sel_setPatternPhase_ = Selector.sel_setPatternPhase_.value;
+public static final long sel_setPlaceholderString_ = Selector.sel_setPlaceholderString_.value;
+public static final long sel_setPolicyDelegate_ = Selector.sel_setPolicyDelegate_.value;
+public static final long sel_setPreferences_ = Selector.sel_setPreferences_.value;
+public static final long sel_setPrinter_ = Selector.sel_setPrinter_.value;
+public static final long sel_setPropertyList_forType_ = Selector.sel_setPropertyList_forType_.value;
+public static final long sel_setPullsDown_ = Selector.sel_setPullsDown_.value;
+public static final long sel_setReleasedWhenClosed_ = Selector.sel_setReleasedWhenClosed_.value;
+public static final long sel_setRepresentedFilename_ = Selector.sel_setRepresentedFilename_.value;
+public static final long sel_setRepresentedURL_ = Selector.sel_setRepresentedURL_.value;
+public static final long sel_setResizingMask_ = Selector.sel_setResizingMask_.value;
+public static final long sel_setResourceLoadDelegate_ = Selector.sel_setResourceLoadDelegate_.value;
+public static final long sel_setRichText_ = Selector.sel_setRichText_.value;
+public static final long sel_setRowHeight_ = Selector.sel_setRowHeight_.value;
+public static final long sel_setScalesWhenResized_ = Selector.sel_setScalesWhenResized_.value;
+public static final long sel_setScrollable_ = Selector.sel_setScrollable_.value;
+public static final long sel_setSearchButtonCell_ = Selector.sel_setSearchButtonCell_.value;
+public static final long sel_setSegmentCount_ = Selector.sel_setSegmentCount_.value;
+public static final long sel_setSegmentStyle_ = Selector.sel_setSegmentStyle_.value;
+public static final long sel_setSelectable_ = Selector.sel_setSelectable_.value;
+public static final long sel_setSelected_forSegment_ = Selector.sel_setSelected_forSegment_.value;
+public static final long sel_setSelectedItemIdentifier_ = Selector.sel_setSelectedItemIdentifier_.value;
+public static final long sel_setSelectedRange_ = Selector.sel_setSelectedRange_.value;
+public static final long sel_setSelectedSegment_ = Selector.sel_setSelectedSegment_.value;
+public static final long sel_setSelectedTextAttributes_ = Selector.sel_setSelectedTextAttributes_.value;
+public static final long sel_setSelectionOnly_ = Selector.sel_setSelectionOnly_.value;
+public static final long sel_setServicesMenu_ = Selector.sel_setServicesMenu_.value;
+public static final long sel_setShouldAntialias_ = Selector.sel_setShouldAntialias_.value;
+public static final long sel_setShowsHelp_ = Selector.sel_setShowsHelp_.value;
+public static final long sel_setShowsPrintPanel_ = Selector.sel_setShowsPrintPanel_.value;
+public static final long sel_setShowsProgressPanel_ = Selector.sel_setShowsProgressPanel_.value;
+public static final long sel_setShowsResizeIndicator_ = Selector.sel_setShowsResizeIndicator_.value;
+public static final long sel_setShowsToolbarButton_ = Selector.sel_setShowsToolbarButton_.value;
+public static final long sel_setSize_ = Selector.sel_setSize_.value;
+public static final long sel_setState_ = Selector.sel_setState_.value;
+public static final long sel_setString_ = Selector.sel_setString_.value;
+public static final long sel_setString_forType_ = Selector.sel_setString_forType_.value;
+public static final long sel_setStringValue_ = Selector.sel_setStringValue_.value;
+public static final long sel_setStroke = Selector.sel_setStroke.value;
+public static final long sel_setSubmenu_ = Selector.sel_setSubmenu_.value;
+public static final long sel_setSubmenu_forItem_ = Selector.sel_setSubmenu_forItem_.value;
+public static final long sel_setTabStops_ = Selector.sel_setTabStops_.value;
+public static final long sel_setTabViewType_ = Selector.sel_setTabViewType_.value;
+public static final long sel_setTag_ = Selector.sel_setTag_.value;
+public static final long sel_setTag_forSegment_ = Selector.sel_setTag_forSegment_.value;
+public static final long sel_setTarget_ = Selector.sel_setTarget_.value;
+public static final long sel_setTextColor_ = Selector.sel_setTextColor_.value;
+public static final long sel_setTextStorage_ = Selector.sel_setTextStorage_.value;
+public static final long sel_setTitle_ = Selector.sel_setTitle_.value;
+public static final long sel_setTitleFont_ = Selector.sel_setTitleFont_.value;
+public static final long sel_setTitlePosition_ = Selector.sel_setTitlePosition_.value;
+public static final long sel_setToolTip_ = Selector.sel_setToolTip_.value;
+public static final long sel_setToolTip_forSegment_ = Selector.sel_setToolTip_forSegment_.value;
+public static final long sel_setToolbar_ = Selector.sel_setToolbar_.value;
+public static final long sel_setTrackingMode_ = Selector.sel_setTrackingMode_.value;
+public static final long sel_setTransformStruct_ = Selector.sel_setTransformStruct_.value;
+public static final long sel_setTreatsFilePackagesAsDirectories_ = Selector.sel_setTreatsFilePackagesAsDirectories_.value;
+public static final long sel_setUIDelegate_ = Selector.sel_setUIDelegate_.value;
+public static final long sel_setURL_ = Selector.sel_setURL_.value;
+public static final long sel_setUpPrintOperationDefaultValues = Selector.sel_setUpPrintOperationDefaultValues.value;
+public static final long sel_setUsesAlternatingRowBackgroundColors_ = Selector.sel_setUsesAlternatingRowBackgroundColors_.value;
+public static final long sel_setUsesFontPanel_ = Selector.sel_setUsesFontPanel_.value;
+public static final long sel_setUsesScreenFonts_ = Selector.sel_setUsesScreenFonts_.value;
+public static final long sel_setUsesSingleLineMode_ = Selector.sel_setUsesSingleLineMode_.value;
+public static final long sel_setUsesThreadedAnimation_ = Selector.sel_setUsesThreadedAnimation_.value;
+public static final long sel_setValue_forHTTPHeaderField_ = Selector.sel_setValue_forHTTPHeaderField_.value;
+public static final long sel_setValue_forKey_ = Selector.sel_setValue_forKey_.value;
+public static final long sel_setValueWraps_ = Selector.sel_setValueWraps_.value;
+public static final long sel_setValues_forParameter_ = Selector.sel_setValues_forParameter_.value;
+public static final long sel_setVerticalScrollElasticity_ = Selector.sel_setVerticalScrollElasticity_.value;
+public static final long sel_setVerticalScroller_ = Selector.sel_setVerticalScroller_.value;
+public static final long sel_setView_ = Selector.sel_setView_.value;
+public static final long sel_setVisible_ = Selector.sel_setVisible_.value;
+public static final long sel_setWantsRestingTouches_ = Selector.sel_setWantsRestingTouches_.value;
+public static final long sel_setWidth_ = Selector.sel_setWidth_.value;
+public static final long sel_setWidth_forSegment_ = Selector.sel_setWidth_forSegment_.value;
+public static final long sel_setWidthTracksTextView_ = Selector.sel_setWidthTracksTextView_.value;
+public static final long sel_setWindingRule_ = Selector.sel_setWindingRule_.value;
+public static final long sel_setWorksWhenModal_ = Selector.sel_setWorksWhenModal_.value;
+public static final long sel_setWraps_ = Selector.sel_setWraps_.value;
+public static final long sel_sharedApplication = Selector.sel_sharedApplication.value;
+public static final long sel_sharedCertificateTrustPanel = Selector.sel_sharedCertificateTrustPanel.value;
+public static final long sel_sharedColorPanel = Selector.sel_sharedColorPanel.value;
+public static final long sel_sharedFontManager = Selector.sel_sharedFontManager.value;
+public static final long sel_sharedFontPanel = Selector.sel_sharedFontPanel.value;
+public static final long sel_sharedHTTPCookieStorage = Selector.sel_sharedHTTPCookieStorage.value;
+public static final long sel_sharedPrintInfo = Selector.sel_sharedPrintInfo.value;
+public static final long sel_sharedWorkspace = Selector.sel_sharedWorkspace.value;
+public static final long sel_shiftKey = Selector.sel_shiftKey.value;
+public static final long sel_shouldAntialias = Selector.sel_shouldAntialias.value;
+public static final long sel_shouldChangeTextInRange_replacementString_ = Selector.sel_shouldChangeTextInRange_replacementString_.value;
+public static final long sel_shouldDelayWindowOrderingForEvent_ = Selector.sel_shouldDelayWindowOrderingForEvent_.value;
+public static final long sel_shouldDrawInsertionPoint = Selector.sel_shouldDrawInsertionPoint.value;
+public static final long sel_size = Selector.sel_size.value;
+public static final long sel_sizeOfLabel_ = Selector.sel_sizeOfLabel_.value;
+public static final long sel_sizeToFit = Selector.sel_sizeToFit.value;
+public static final long sel_sizeValue = Selector.sel_sizeValue.value;
+public static final long sel_skipDescendents = Selector.sel_skipDescendents.value;
+public static final long sel_smallSystemFontSize = Selector.sel_smallSystemFontSize.value;
+public static final long sel_sortIndicatorRectForBounds_ = Selector.sel_sortIndicatorRectForBounds_.value;
+public static final long sel_standardPreferences = Selector.sel_standardPreferences.value;
+public static final long sel_standardUserDefaults = Selector.sel_standardUserDefaults.value;
+public static final long sel_standardWindowButton_ = Selector.sel_standardWindowButton_.value;
+public static final long sel_startAnimation_ = Selector.sel_startAnimation_.value;
+public static final long sel_state = Selector.sel_state.value;
+public static final long sel_statusItemWithLength_ = Selector.sel_statusItemWithLength_.value;
+public static final long sel_stop_ = Selector.sel_stop_.value;
+public static final long sel_stopAnimation_ = Selector.sel_stopAnimation_.value;
+public static final long sel_stopLoading_ = Selector.sel_stopLoading_.value;
+public static final long sel_stopModal = Selector.sel_stopModal.value;
+public static final long sel_string = Selector.sel_string.value;
+public static final long sel_stringByAddingPercentEscapesUsingEncoding_ = Selector.sel_stringByAddingPercentEscapesUsingEncoding_.value;
+public static final long sel_stringByAppendingPathComponent_ = Selector.sel_stringByAppendingPathComponent_.value;
+public static final long sel_stringByAppendingPathExtension_ = Selector.sel_stringByAppendingPathExtension_.value;
+public static final long sel_stringByAppendingString_ = Selector.sel_stringByAppendingString_.value;
+public static final long sel_stringByDeletingLastPathComponent = Selector.sel_stringByDeletingLastPathComponent.value;
+public static final long sel_stringByDeletingPathExtension = Selector.sel_stringByDeletingPathExtension.value;
+public static final long sel_stringByReplacingOccurrencesOfString_withString_ = Selector.sel_stringByReplacingOccurrencesOfString_withString_.value;
+public static final long sel_stringByReplacingPercentEscapesUsingEncoding_ = Selector.sel_stringByReplacingPercentEscapesUsingEncoding_.value;
+public static final long sel_stringForKey_ = Selector.sel_stringForKey_.value;
+public static final long sel_stringForObjectValue_ = Selector.sel_stringForObjectValue_.value;
+public static final long sel_stringForType_ = Selector.sel_stringForType_.value;
+public static final long sel_stringValue = Selector.sel_stringValue.value;
+public static final long sel_stringWithCharacters_length_ = Selector.sel_stringWithCharacters_length_.value;
+public static final long sel_stringWithUTF8String_ = Selector.sel_stringWithUTF8String_.value;
+public static final long sel_stroke = Selector.sel_stroke.value;
+public static final long sel_strokeRect_ = Selector.sel_strokeRect_.value;
+public static final long sel_styleMask = Selector.sel_styleMask.value;
+public static final long sel_submenu = Selector.sel_submenu.value;
+public static final long sel_subviews = Selector.sel_subviews.value;
+public static final long sel_superclass = Selector.sel_superclass.value;
+public static final long sel_superview = Selector.sel_superview.value;
+public static final long sel_swipeWithEvent_ = Selector.sel_swipeWithEvent_.value;
+public static final long sel_systemFontOfSize_ = Selector.sel_systemFontOfSize_.value;
+public static final long sel_systemFontSize = Selector.sel_systemFontSize.value;
+public static final long sel_systemFontSizeForControlSize_ = Selector.sel_systemFontSizeForControlSize_.value;
+public static final long sel_systemStatusBar = Selector.sel_systemStatusBar.value;
+public static final long sel_systemVersion = Selector.sel_systemVersion.value;
+public static final long sel_tabStopType = Selector.sel_tabStopType.value;
+public static final long sel_tabStops = Selector.sel_tabStops.value;
+public static final long sel_tabView_didSelectTabViewItem_ = Selector.sel_tabView_didSelectTabViewItem_.value;
+public static final long sel_tabView_shouldSelectTabViewItem_ = Selector.sel_tabView_shouldSelectTabViewItem_.value;
+public static final long sel_tabView_willSelectTabViewItem_ = Selector.sel_tabView_willSelectTabViewItem_.value;
+public static final long sel_tabViewItemAtPoint_ = Selector.sel_tabViewItemAtPoint_.value;
+public static final long sel_tableColumns = Selector.sel_tableColumns.value;
+public static final long sel_tableView_acceptDrop_row_dropOperation_ = Selector.sel_tableView_acceptDrop_row_dropOperation_.value;
+public static final long sel_tableView_didClickTableColumn_ = Selector.sel_tableView_didClickTableColumn_.value;
+public static final long sel_tableView_objectValueForTableColumn_row_ = Selector.sel_tableView_objectValueForTableColumn_row_.value;
+public static final long sel_tableView_setObjectValue_forTableColumn_row_ = Selector.sel_tableView_setObjectValue_forTableColumn_row_.value;
+public static final long sel_tableView_shouldEditTableColumn_row_ = Selector.sel_tableView_shouldEditTableColumn_row_.value;
+public static final long sel_tableView_shouldReorderColumn_toColumn_ = Selector.sel_tableView_shouldReorderColumn_toColumn_.value;
+public static final long sel_tableView_shouldSelectRow_ = Selector.sel_tableView_shouldSelectRow_.value;
+public static final long sel_tableView_shouldTrackCell_forTableColumn_row_ = Selector.sel_tableView_shouldTrackCell_forTableColumn_row_.value;
+public static final long sel_tableView_validateDrop_proposedRow_proposedDropOperation_ = Selector.sel_tableView_validateDrop_proposedRow_proposedDropOperation_.value;
+public static final long sel_tableView_willDisplayCell_forTableColumn_row_ = Selector.sel_tableView_willDisplayCell_forTableColumn_row_.value;
+public static final long sel_tableView_writeRowsWithIndexes_toPasteboard_ = Selector.sel_tableView_writeRowsWithIndexes_toPasteboard_.value;
+public static final long sel_tableViewColumnDidMove_ = Selector.sel_tableViewColumnDidMove_.value;
+public static final long sel_tableViewColumnDidResize_ = Selector.sel_tableViewColumnDidResize_.value;
+public static final long sel_tableViewSelectionDidChange_ = Selector.sel_tableViewSelectionDidChange_.value;
+public static final long sel_tableViewSelectionIsChanging_ = Selector.sel_tableViewSelectionIsChanging_.value;
+public static final long sel_tag = Selector.sel_tag.value;
+public static final long sel_target = Selector.sel_target.value;
+public static final long sel_terminate_ = Selector.sel_terminate_.value;
+public static final long sel_testPart_ = Selector.sel_testPart_.value;
+public static final long sel_textBackgroundColor = Selector.sel_textBackgroundColor.value;
+public static final long sel_textColor = Selector.sel_textColor.value;
+public static final long sel_textContainer = Selector.sel_textContainer.value;
+public static final long sel_textDidChange_ = Selector.sel_textDidChange_.value;
+public static final long sel_textDidEndEditing_ = Selector.sel_textDidEndEditing_.value;
+public static final long sel_textStorage = Selector.sel_textStorage.value;
+public static final long sel_textView_clickedOnLink_atIndex_ = Selector.sel_textView_clickedOnLink_atIndex_.value;
+public static final long sel_textView_willChangeSelectionFromCharacterRange_toCharacterRange_ = Selector.sel_textView_willChangeSelectionFromCharacterRange_toCharacterRange_.value;
+public static final long sel_textViewDidChangeSelection_ = Selector.sel_textViewDidChangeSelection_.value;
+public static final long sel_thickness = Selector.sel_thickness.value;
+public static final long sel_threadDictionary = Selector.sel_threadDictionary.value;
+public static final long sel_tile = Selector.sel_tile.value;
+public static final long sel_timeZone = Selector.sel_timeZone.value;
+public static final long sel_timestamp = Selector.sel_timestamp.value;
+public static final long sel_title = Selector.sel_title.value;
+public static final long sel_titleCell = Selector.sel_titleCell.value;
+public static final long sel_titleFont = Selector.sel_titleFont.value;
+public static final long sel_titleOfSelectedItem = Selector.sel_titleOfSelectedItem.value;
+public static final long sel_titleRectForBounds_ = Selector.sel_titleRectForBounds_.value;
+public static final long sel_toggleToolbarShown_ = Selector.sel_toggleToolbarShown_.value;
+public static final long sel_toolbar = Selector.sel_toolbar.value;
+public static final long sel_toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar_ = Selector.sel_toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar_.value;
+public static final long sel_toolbarAllowedItemIdentifiers_ = Selector.sel_toolbarAllowedItemIdentifiers_.value;
+public static final long sel_toolbarDefaultItemIdentifiers_ = Selector.sel_toolbarDefaultItemIdentifiers_.value;
+public static final long sel_toolbarDidRemoveItem_ = Selector.sel_toolbarDidRemoveItem_.value;
+public static final long sel_toolbarSelectableItemIdentifiers_ = Selector.sel_toolbarSelectableItemIdentifiers_.value;
+public static final long sel_toolbarWillAddItem_ = Selector.sel_toolbarWillAddItem_.value;
+public static final long sel_touchesBeganWithEvent_ = Selector.sel_touchesBeganWithEvent_.value;
+public static final long sel_touchesCancelledWithEvent_ = Selector.sel_touchesCancelledWithEvent_.value;
+public static final long sel_touchesEndedWithEvent_ = Selector.sel_touchesEndedWithEvent_.value;
+public static final long sel_touchesMatchingPhase_inView_ = Selector.sel_touchesMatchingPhase_inView_.value;
+public static final long sel_touchesMovedWithEvent_ = Selector.sel_touchesMovedWithEvent_.value;
+public static final long sel_trackingAreas = Selector.sel_trackingAreas.value;
+public static final long sel_traitsOfFont_ = Selector.sel_traitsOfFont_.value;
+public static final long sel_transform = Selector.sel_transform.value;
+public static final long sel_transformPoint_ = Selector.sel_transformPoint_.value;
+public static final long sel_transformSize_ = Selector.sel_transformSize_.value;
+public static final long sel_transformStruct = Selector.sel_transformStruct.value;
+public static final long sel_transformUsingAffineTransform_ = Selector.sel_transformUsingAffineTransform_.value;
+public static final long sel_translateXBy_yBy_ = Selector.sel_translateXBy_yBy_.value;
+public static final long sel_type = Selector.sel_type.value;
+public static final long sel_type_conformsToType_ = Selector.sel_type_conformsToType_.value;
+public static final long sel_typeOfFile_error_ = Selector.sel_typeOfFile_error_.value;
+public static final long sel_types = Selector.sel_types.value;
+public static final long sel_typesetter = Selector.sel_typesetter.value;
+public static final long sel_unarchiveObjectWithData_ = Selector.sel_unarchiveObjectWithData_.value;
+public static final long sel_undefined = Selector.sel_undefined.value;
+public static final long sel_undo = Selector.sel_undo.value;
+public static final long sel_undoManager = Selector.sel_undoManager.value;
+public static final long sel_unhideAllApplications_ = Selector.sel_unhideAllApplications_.value;
+public static final long sel_unlockFocus = Selector.sel_unlockFocus.value;
+public static final long sel_unmarkText = Selector.sel_unmarkText.value;
+public static final long sel_unregisterDraggedTypes = Selector.sel_unregisterDraggedTypes.value;
+public static final long sel_update = Selector.sel_update.value;
+public static final long sel_updateFromPMPrintSettings = Selector.sel_updateFromPMPrintSettings.value;
+public static final long sel_updateTrackingAreas = Selector.sel_updateTrackingAreas.value;
+public static final long sel_use = Selector.sel_use.value;
+public static final long sel_useCredential_forAuthenticationChallenge_ = Selector.sel_useCredential_forAuthenticationChallenge_.value;
+public static final long sel_usedRectForTextContainer_ = Selector.sel_usedRectForTextContainer_.value;
+public static final long sel_user = Selector.sel_user.value;
+public static final long sel_userInfo = Selector.sel_userInfo.value;
+public static final long sel_usesAlternatingRowBackgroundColors = Selector.sel_usesAlternatingRowBackgroundColors.value;
+public static final long sel_validAttributesForMarkedText = Selector.sel_validAttributesForMarkedText.value;
+public static final long sel_validModesForFontPanel_ = Selector.sel_validModesForFontPanel_.value;
+public static final long sel_validRequestorForSendType_returnType_ = Selector.sel_validRequestorForSendType_returnType_.value;
+public static final long sel_validateMenuItem_ = Selector.sel_validateMenuItem_.value;
+public static final long sel_validateVisibleColumns = Selector.sel_validateVisibleColumns.value;
+public static final long sel_value = Selector.sel_value.value;
+public static final long sel_valueForKey_ = Selector.sel_valueForKey_.value;
+public static final long sel_valueWithPoint_ = Selector.sel_valueWithPoint_.value;
+public static final long sel_valueWithRange_ = Selector.sel_valueWithRange_.value;
+public static final long sel_valueWithRect_ = Selector.sel_valueWithRect_.value;
+public static final long sel_valueWithSize_ = Selector.sel_valueWithSize_.value;
+public static final long sel_view = Selector.sel_view.value;
+public static final long sel_view_stringForToolTip_point_userData_ = Selector.sel_view_stringForToolTip_point_userData_.value;
+public static final long sel_viewDidMoveToWindow = Selector.sel_viewDidMoveToWindow.value;
+public static final long sel_viewWillMoveToWindow_ = Selector.sel_viewWillMoveToWindow_.value;
+public static final long sel_visibleFrame = Selector.sel_visibleFrame.value;
+public static final long sel_visibleRect = Selector.sel_visibleRect.value;
+public static final long sel_wantsPeriodicDraggingUpdates = Selector.sel_wantsPeriodicDraggingUpdates.value;
+public static final long sel_wantsToHandleMouseEvents = Selector.sel_wantsToHandleMouseEvents.value;
+public static final long sel_webFrame = Selector.sel_webFrame.value;
+public static final long sel_webScriptValueAtIndex_ = Selector.sel_webScriptValueAtIndex_.value;
+public static final long sel_webView_contextMenuItemsForElement_defaultMenuItems_ = Selector.sel_webView_contextMenuItemsForElement_defaultMenuItems_.value;
+public static final long sel_webView_createWebViewWithRequest_ = Selector.sel_webView_createWebViewWithRequest_.value;
+public static final long sel_webView_decidePolicyForMIMEType_request_frame_decisionListener_ = Selector.sel_webView_decidePolicyForMIMEType_request_frame_decisionListener_.value;
+public static final long sel_webView_decidePolicyForNavigationAction_request_frame_decisionListener_ = Selector.sel_webView_decidePolicyForNavigationAction_request_frame_decisionListener_.value;
+public static final long sel_webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener_ = Selector.sel_webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener_.value;
+public static final long sel_webView_didChangeLocationWithinPageForFrame_ = Selector.sel_webView_didChangeLocationWithinPageForFrame_.value;
+public static final long sel_webView_didCommitLoadForFrame_ = Selector.sel_webView_didCommitLoadForFrame_.value;
+public static final long sel_webView_didFailProvisionalLoadWithError_forFrame_ = Selector.sel_webView_didFailProvisionalLoadWithError_forFrame_.value;
+public static final long sel_webView_didFinishLoadForFrame_ = Selector.sel_webView_didFinishLoadForFrame_.value;
+public static final long sel_webView_didReceiveTitle_forFrame_ = Selector.sel_webView_didReceiveTitle_forFrame_.value;
+public static final long sel_webView_didStartProvisionalLoadForFrame_ = Selector.sel_webView_didStartProvisionalLoadForFrame_.value;
+public static final long sel_webView_identifierForInitialRequest_fromDataSource_ = Selector.sel_webView_identifierForInitialRequest_fromDataSource_.value;
+public static final long sel_webView_mouseDidMoveOverElement_modifierFlags_ = Selector.sel_webView_mouseDidMoveOverElement_modifierFlags_.value;
+public static final long sel_webView_printFrameView_ = Selector.sel_webView_printFrameView_.value;
+public static final long sel_webView_resource_didFailLoadingWithError_fromDataSource_ = Selector.sel_webView_resource_didFailLoadingWithError_fromDataSource_.value;
+public static final long sel_webView_resource_didFinishLoadingFromDataSource_ = Selector.sel_webView_resource_didFinishLoadingFromDataSource_.value;
+public static final long sel_webView_resource_didReceiveAuthenticationChallenge_fromDataSource_ = Selector.sel_webView_resource_didReceiveAuthenticationChallenge_fromDataSource_.value;
+public static final long sel_webView_resource_willSendRequest_redirectResponse_fromDataSource_ = Selector.sel_webView_resource_willSendRequest_redirectResponse_fromDataSource_.value;
+public static final long sel_webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame_ = Selector.sel_webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame_.value;
+public static final long sel_webView_runJavaScriptAlertPanelWithMessage_ = Selector.sel_webView_runJavaScriptAlertPanelWithMessage_.value;
+public static final long sel_webView_runJavaScriptAlertPanelWithMessage_initiatedByFrame_ = Selector.sel_webView_runJavaScriptAlertPanelWithMessage_initiatedByFrame_.value;
+public static final long sel_webView_runJavaScriptConfirmPanelWithMessage_ = Selector.sel_webView_runJavaScriptConfirmPanelWithMessage_.value;
+public static final long sel_webView_runJavaScriptConfirmPanelWithMessage_initiatedByFrame_ = Selector.sel_webView_runJavaScriptConfirmPanelWithMessage_initiatedByFrame_.value;
+public static final long sel_webView_runOpenPanelForFileButtonWithResultListener_ = Selector.sel_webView_runOpenPanelForFileButtonWithResultListener_.value;
+public static final long sel_webView_setFrame_ = Selector.sel_webView_setFrame_.value;
+public static final long sel_webView_setResizable_ = Selector.sel_webView_setResizable_.value;
+public static final long sel_webView_setStatusBarVisible_ = Selector.sel_webView_setStatusBarVisible_.value;
+public static final long sel_webView_setStatusText_ = Selector.sel_webView_setStatusText_.value;
+public static final long sel_webView_setToolbarsVisible_ = Selector.sel_webView_setToolbarsVisible_.value;
+public static final long sel_webView_unableToImplementPolicyWithError_frame_ = Selector.sel_webView_unableToImplementPolicyWithError_frame_.value;
+public static final long sel_webView_windowScriptObjectAvailable_ = Selector.sel_webView_windowScriptObjectAvailable_.value;
+public static final long sel_webViewClose_ = Selector.sel_webViewClose_.value;
+public static final long sel_webViewFocus_ = Selector.sel_webViewFocus_.value;
+public static final long sel_webViewShow_ = Selector.sel_webViewShow_.value;
+public static final long sel_webViewUnfocus_ = Selector.sel_webViewUnfocus_.value;
+public static final long sel_weightOfFont_ = Selector.sel_weightOfFont_.value;
+public static final long sel_wheelDelta = Selector.sel_wheelDelta.value;
+public static final long sel_wheelDeltaX = Selector.sel_wheelDeltaX.value;
+public static final long sel_wheelDeltaY = Selector.sel_wheelDeltaY.value;
+public static final long sel_width = Selector.sel_width.value;
+public static final long sel_window = Selector.sel_window.value;
+public static final long sel_windowBackgroundColor = Selector.sel_windowBackgroundColor.value;
+public static final long sel_windowDidBecomeKey_ = Selector.sel_windowDidBecomeKey_.value;
+public static final long sel_windowDidDeminiaturize_ = Selector.sel_windowDidDeminiaturize_.value;
+public static final long sel_windowDidMiniaturize_ = Selector.sel_windowDidMiniaturize_.value;
+public static final long sel_windowDidMove_ = Selector.sel_windowDidMove_.value;
+public static final long sel_windowDidResignKey_ = Selector.sel_windowDidResignKey_.value;
+public static final long sel_windowDidResize_ = Selector.sel_windowDidResize_.value;
+public static final long sel_windowFrameColor = Selector.sel_windowFrameColor.value;
+public static final long sel_windowFrameTextColor = Selector.sel_windowFrameTextColor.value;
+public static final long sel_windowNumber = Selector.sel_windowNumber.value;
+public static final long sel_windowNumberAtPoint_belowWindowWithWindowNumber_ = Selector.sel_windowNumberAtPoint_belowWindowWithWindowNumber_.value;
+public static final long sel_windowRef = Selector.sel_windowRef.value;
+public static final long sel_windowShouldClose_ = Selector.sel_windowShouldClose_.value;
+public static final long sel_windowWillClose_ = Selector.sel_windowWillClose_.value;
+public static final long sel_windowWithWindowNumber_ = Selector.sel_windowWithWindowNumber_.value;
+public static final long sel_windows = Selector.sel_windows.value;
+public static final long sel_worksWhenModal = Selector.sel_worksWhenModal.value;
+public static final long sel_wraps = Selector.sel_wraps.value;
+public static final long sel_writeObjects_ = Selector.sel_writeObjects_.value;
+public static final long sel_writeSelectionToPasteboard_types_ = Selector.sel_writeSelectionToPasteboard_types_.value;
+public static final long sel_yearOfCommonEra = Selector.sel_yearOfCommonEra.value;
+public static final long sel_zoom_ = Selector.sel_zoom_.value;
 
 /** Constants */
 public static final int NSAlertFirstButtonReturn = 1000;
@@ -2412,7 +2412,7 @@ public static final int NSAlertThirdButtonReturn = 1002;
 public static final int NSAlphaFirstBitmapFormat = 1;
 public static final int NSAlphaNonpremultipliedBitmapFormat = 2;
 public static final int NSAlternateKeyMask = 524288;
-public static final int NSAnyEventMask = -1;
+public static final long NSAnyEventMask = -1L;
 public static final int NSAppKitDefined = 13;
 public static final int NSApplicationActivateIgnoringOtherApps = 2;
 public static final int NSApplicationActivationPolicyRegular = 0;
@@ -2450,7 +2450,7 @@ public static final long NSDeviceIndependentModifierFlagsMask = 4294901760L;
 public static final int NSDocModalWindowMask = 64;
 public static final int NSDragOperationCopy = 1;
 public static final int NSDragOperationDelete = 32;
-public static final int NSDragOperationEvery = -1;
+public static final long NSDragOperationEvery = -1L;
 public static final int NSDragOperationLink = 2;
 public static final int NSDragOperationMove = 16;
 public static final int NSDragOperationNone = 0;
@@ -2603,7 +2603,7 @@ public static final int NSTextFieldDatePickerStyle = 2;
 public static final int NSTitledWindowMask = 1;
 public static final int NSToolbarDisplayModeIconOnly = 2;
 public static final int NSTouchEventSubtype = 3;
-public static final int NSTouchPhaseAny = -1;
+public static final long NSTouchPhaseAny = -1L;
 public static final int NSTouchPhaseBegan = 1;
 public static final int NSTouchPhaseCancelled = 16;
 public static final int NSTouchPhaseEnded = 8;
@@ -2691,700 +2691,700 @@ public static final int NSUserDomainMask = 1;
 
 /** Globals */
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityAttributedStringForRangeParameterizedAttribute();
+public static final native long NSAccessibilityAttributedStringForRangeParameterizedAttribute();
 public static final NSString NSAccessibilityAttributedStringForRangeParameterizedAttribute = new NSString(NSAccessibilityAttributedStringForRangeParameterizedAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityBackgroundColorTextAttribute();
+public static final native long NSAccessibilityBackgroundColorTextAttribute();
 public static final NSString NSAccessibilityBackgroundColorTextAttribute = new NSString(NSAccessibilityBackgroundColorTextAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityBoundsForRangeParameterizedAttribute();
+public static final native long NSAccessibilityBoundsForRangeParameterizedAttribute();
 public static final NSString NSAccessibilityBoundsForRangeParameterizedAttribute = new NSString(NSAccessibilityBoundsForRangeParameterizedAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityButtonRole();
+public static final native long NSAccessibilityButtonRole();
 public static final NSString NSAccessibilityButtonRole = new NSString(NSAccessibilityButtonRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityCheckBoxRole();
+public static final native long NSAccessibilityCheckBoxRole();
 public static final NSString NSAccessibilityCheckBoxRole = new NSString(NSAccessibilityCheckBoxRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityChildrenAttribute();
+public static final native long NSAccessibilityChildrenAttribute();
 public static final NSString NSAccessibilityChildrenAttribute = new NSString(NSAccessibilityChildrenAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityColorWellRole();
+public static final native long NSAccessibilityColorWellRole();
 public static final NSString NSAccessibilityColorWellRole = new NSString(NSAccessibilityColorWellRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityColumnRole();
+public static final native long NSAccessibilityColumnRole();
 public static final NSString NSAccessibilityColumnRole = new NSString(NSAccessibilityColumnRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityColumnsAttribute();
+public static final native long NSAccessibilityColumnsAttribute();
 public static final NSString NSAccessibilityColumnsAttribute = new NSString(NSAccessibilityColumnsAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityComboBoxRole();
+public static final native long NSAccessibilityComboBoxRole();
 public static final NSString NSAccessibilityComboBoxRole = new NSString(NSAccessibilityComboBoxRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityConfirmAction();
+public static final native long NSAccessibilityConfirmAction();
 public static final NSString NSAccessibilityConfirmAction = new NSString(NSAccessibilityConfirmAction());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityContentsAttribute();
+public static final native long NSAccessibilityContentsAttribute();
 public static final NSString NSAccessibilityContentsAttribute = new NSString(NSAccessibilityContentsAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityDescriptionAttribute();
+public static final native long NSAccessibilityDescriptionAttribute();
 public static final NSString NSAccessibilityDescriptionAttribute = new NSString(NSAccessibilityDescriptionAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityDialogSubrole();
+public static final native long NSAccessibilityDialogSubrole();
 public static final NSString NSAccessibilityDialogSubrole = new NSString(NSAccessibilityDialogSubrole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityEnabledAttribute();
+public static final native long NSAccessibilityEnabledAttribute();
 public static final NSString NSAccessibilityEnabledAttribute = new NSString(NSAccessibilityEnabledAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityExpandedAttribute();
+public static final native long NSAccessibilityExpandedAttribute();
 public static final NSString NSAccessibilityExpandedAttribute = new NSString(NSAccessibilityExpandedAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityFloatingWindowSubrole();
+public static final native long NSAccessibilityFloatingWindowSubrole();
 public static final NSString NSAccessibilityFloatingWindowSubrole = new NSString(NSAccessibilityFloatingWindowSubrole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityFocusedAttribute();
+public static final native long NSAccessibilityFocusedAttribute();
 public static final NSString NSAccessibilityFocusedAttribute = new NSString(NSAccessibilityFocusedAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityFocusedUIElementChangedNotification();
+public static final native long NSAccessibilityFocusedUIElementChangedNotification();
 public static final NSString NSAccessibilityFocusedUIElementChangedNotification = new NSString(NSAccessibilityFocusedUIElementChangedNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityFocusedWindowChangedNotification();
+public static final native long NSAccessibilityFocusedWindowChangedNotification();
 public static final NSString NSAccessibilityFocusedWindowChangedNotification = new NSString(NSAccessibilityFocusedWindowChangedNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityFontFamilyKey();
+public static final native long NSAccessibilityFontFamilyKey();
 public static final NSString NSAccessibilityFontFamilyKey = new NSString(NSAccessibilityFontFamilyKey());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityFontNameKey();
+public static final native long NSAccessibilityFontNameKey();
 public static final NSString NSAccessibilityFontNameKey = new NSString(NSAccessibilityFontNameKey());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityFontSizeKey();
+public static final native long NSAccessibilityFontSizeKey();
 public static final NSString NSAccessibilityFontSizeKey = new NSString(NSAccessibilityFontSizeKey());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityFontTextAttribute();
+public static final native long NSAccessibilityFontTextAttribute();
 public static final NSString NSAccessibilityFontTextAttribute = new NSString(NSAccessibilityFontTextAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityForegroundColorTextAttribute();
+public static final native long NSAccessibilityForegroundColorTextAttribute();
 public static final NSString NSAccessibilityForegroundColorTextAttribute = new NSString(NSAccessibilityForegroundColorTextAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityGridRole();
+public static final native long NSAccessibilityGridRole();
 public static final NSString NSAccessibilityGridRole = new NSString(NSAccessibilityGridRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityGroupRole();
+public static final native long NSAccessibilityGroupRole();
 public static final NSString NSAccessibilityGroupRole = new NSString(NSAccessibilityGroupRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityHeaderAttribute();
+public static final native long NSAccessibilityHeaderAttribute();
 public static final NSString NSAccessibilityHeaderAttribute = new NSString(NSAccessibilityHeaderAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityHelpAttribute();
+public static final native long NSAccessibilityHelpAttribute();
 public static final NSString NSAccessibilityHelpAttribute = new NSString(NSAccessibilityHelpAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityHelpTagRole();
+public static final native long NSAccessibilityHelpTagRole();
 public static final NSString NSAccessibilityHelpTagRole = new NSString(NSAccessibilityHelpTagRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityHorizontalOrientationValue();
+public static final native long NSAccessibilityHorizontalOrientationValue();
 public static final NSString NSAccessibilityHorizontalOrientationValue = new NSString(NSAccessibilityHorizontalOrientationValue());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityHorizontalScrollBarAttribute();
+public static final native long NSAccessibilityHorizontalScrollBarAttribute();
 public static final NSString NSAccessibilityHorizontalScrollBarAttribute = new NSString(NSAccessibilityHorizontalScrollBarAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityImageRole();
+public static final native long NSAccessibilityImageRole();
 public static final NSString NSAccessibilityImageRole = new NSString(NSAccessibilityImageRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityIncrementorRole();
+public static final native long NSAccessibilityIncrementorRole();
 public static final NSString NSAccessibilityIncrementorRole = new NSString(NSAccessibilityIncrementorRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityIndexAttribute();
+public static final native long NSAccessibilityIndexAttribute();
 public static final NSString NSAccessibilityIndexAttribute = new NSString(NSAccessibilityIndexAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityInsertionPointLineNumberAttribute();
+public static final native long NSAccessibilityInsertionPointLineNumberAttribute();
 public static final NSString NSAccessibilityInsertionPointLineNumberAttribute = new NSString(NSAccessibilityInsertionPointLineNumberAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityLabelValueAttribute();
+public static final native long NSAccessibilityLabelValueAttribute();
 public static final NSString NSAccessibilityLabelValueAttribute = new NSString(NSAccessibilityLabelValueAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityLineForIndexParameterizedAttribute();
+public static final native long NSAccessibilityLineForIndexParameterizedAttribute();
 public static final NSString NSAccessibilityLineForIndexParameterizedAttribute = new NSString(NSAccessibilityLineForIndexParameterizedAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityLinkRole();
+public static final native long NSAccessibilityLinkRole();
 public static final NSString NSAccessibilityLinkRole = new NSString(NSAccessibilityLinkRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityLinkTextAttribute();
+public static final native long NSAccessibilityLinkTextAttribute();
 public static final NSString NSAccessibilityLinkTextAttribute = new NSString(NSAccessibilityLinkTextAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityLinkedUIElementsAttribute();
+public static final native long NSAccessibilityLinkedUIElementsAttribute();
 public static final NSString NSAccessibilityLinkedUIElementsAttribute = new NSString(NSAccessibilityLinkedUIElementsAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityListRole();
+public static final native long NSAccessibilityListRole();
 public static final NSString NSAccessibilityListRole = new NSString(NSAccessibilityListRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityMaxValueAttribute();
+public static final native long NSAccessibilityMaxValueAttribute();
 public static final NSString NSAccessibilityMaxValueAttribute = new NSString(NSAccessibilityMaxValueAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityMenuBarRole();
+public static final native long NSAccessibilityMenuBarRole();
 public static final NSString NSAccessibilityMenuBarRole = new NSString(NSAccessibilityMenuBarRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityMenuButtonRole();
+public static final native long NSAccessibilityMenuButtonRole();
 public static final NSString NSAccessibilityMenuButtonRole = new NSString(NSAccessibilityMenuButtonRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityMenuItemRole();
+public static final native long NSAccessibilityMenuItemRole();
 public static final NSString NSAccessibilityMenuItemRole = new NSString(NSAccessibilityMenuItemRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityMenuRole();
+public static final native long NSAccessibilityMenuRole();
 public static final NSString NSAccessibilityMenuRole = new NSString(NSAccessibilityMenuRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityMinValueAttribute();
+public static final native long NSAccessibilityMinValueAttribute();
 public static final NSString NSAccessibilityMinValueAttribute = new NSString(NSAccessibilityMinValueAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityMisspelledTextAttribute();
+public static final native long NSAccessibilityMisspelledTextAttribute();
 public static final NSString NSAccessibilityMisspelledTextAttribute = new NSString(NSAccessibilityMisspelledTextAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityMovedNotification();
+public static final native long NSAccessibilityMovedNotification();
 public static final NSString NSAccessibilityMovedNotification = new NSString(NSAccessibilityMovedNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityNextContentsAttribute();
+public static final native long NSAccessibilityNextContentsAttribute();
 public static final NSString NSAccessibilityNextContentsAttribute = new NSString(NSAccessibilityNextContentsAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityNumberOfCharactersAttribute();
+public static final native long NSAccessibilityNumberOfCharactersAttribute();
 public static final NSString NSAccessibilityNumberOfCharactersAttribute = new NSString(NSAccessibilityNumberOfCharactersAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityOrientationAttribute();
+public static final native long NSAccessibilityOrientationAttribute();
 public static final NSString NSAccessibilityOrientationAttribute = new NSString(NSAccessibilityOrientationAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityOutlineRole();
+public static final native long NSAccessibilityOutlineRole();
 public static final NSString NSAccessibilityOutlineRole = new NSString(NSAccessibilityOutlineRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityOutlineRowSubrole();
+public static final native long NSAccessibilityOutlineRowSubrole();
 public static final NSString NSAccessibilityOutlineRowSubrole = new NSString(NSAccessibilityOutlineRowSubrole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityParentAttribute();
+public static final native long NSAccessibilityParentAttribute();
 public static final NSString NSAccessibilityParentAttribute = new NSString(NSAccessibilityParentAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityPopUpButtonRole();
+public static final native long NSAccessibilityPopUpButtonRole();
 public static final NSString NSAccessibilityPopUpButtonRole = new NSString(NSAccessibilityPopUpButtonRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityPositionAttribute();
+public static final native long NSAccessibilityPositionAttribute();
 public static final NSString NSAccessibilityPositionAttribute = new NSString(NSAccessibilityPositionAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityPressAction();
+public static final native long NSAccessibilityPressAction();
 public static final NSString NSAccessibilityPressAction = new NSString(NSAccessibilityPressAction());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityPreviousContentsAttribute();
+public static final native long NSAccessibilityPreviousContentsAttribute();
 public static final NSString NSAccessibilityPreviousContentsAttribute = new NSString(NSAccessibilityPreviousContentsAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityProgressIndicatorRole();
+public static final native long NSAccessibilityProgressIndicatorRole();
 public static final NSString NSAccessibilityProgressIndicatorRole = new NSString(NSAccessibilityProgressIndicatorRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityRTFForRangeParameterizedAttribute();
+public static final native long NSAccessibilityRTFForRangeParameterizedAttribute();
 public static final NSString NSAccessibilityRTFForRangeParameterizedAttribute = new NSString(NSAccessibilityRTFForRangeParameterizedAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityRadioButtonRole();
+public static final native long NSAccessibilityRadioButtonRole();
 public static final NSString NSAccessibilityRadioButtonRole = new NSString(NSAccessibilityRadioButtonRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityRadioGroupRole();
+public static final native long NSAccessibilityRadioGroupRole();
 public static final NSString NSAccessibilityRadioGroupRole = new NSString(NSAccessibilityRadioGroupRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityRangeForIndexParameterizedAttribute();
+public static final native long NSAccessibilityRangeForIndexParameterizedAttribute();
 public static final NSString NSAccessibilityRangeForIndexParameterizedAttribute = new NSString(NSAccessibilityRangeForIndexParameterizedAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityRangeForLineParameterizedAttribute();
+public static final native long NSAccessibilityRangeForLineParameterizedAttribute();
 public static final NSString NSAccessibilityRangeForLineParameterizedAttribute = new NSString(NSAccessibilityRangeForLineParameterizedAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityRangeForPositionParameterizedAttribute();
+public static final native long NSAccessibilityRangeForPositionParameterizedAttribute();
 public static final NSString NSAccessibilityRangeForPositionParameterizedAttribute = new NSString(NSAccessibilityRangeForPositionParameterizedAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityResizedNotification();
+public static final native long NSAccessibilityResizedNotification();
 public static final NSString NSAccessibilityResizedNotification = new NSString(NSAccessibilityResizedNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityRoleAttribute();
+public static final native long NSAccessibilityRoleAttribute();
 public static final NSString NSAccessibilityRoleAttribute = new NSString(NSAccessibilityRoleAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityRoleDescriptionAttribute();
+public static final native long NSAccessibilityRoleDescriptionAttribute();
 public static final NSString NSAccessibilityRoleDescriptionAttribute = new NSString(NSAccessibilityRoleDescriptionAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityRowCountChangedNotification();
+public static final native long NSAccessibilityRowCountChangedNotification();
 public static final NSString NSAccessibilityRowCountChangedNotification = new NSString(NSAccessibilityRowCountChangedNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityRowRole();
+public static final native long NSAccessibilityRowRole();
 public static final NSString NSAccessibilityRowRole = new NSString(NSAccessibilityRowRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityRowsAttribute();
+public static final native long NSAccessibilityRowsAttribute();
 public static final NSString NSAccessibilityRowsAttribute = new NSString(NSAccessibilityRowsAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityScrollAreaRole();
+public static final native long NSAccessibilityScrollAreaRole();
 public static final NSString NSAccessibilityScrollAreaRole = new NSString(NSAccessibilityScrollAreaRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityScrollBarRole();
+public static final native long NSAccessibilityScrollBarRole();
 public static final NSString NSAccessibilityScrollBarRole = new NSString(NSAccessibilityScrollBarRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySelectedAttribute();
+public static final native long NSAccessibilitySelectedAttribute();
 public static final NSString NSAccessibilitySelectedAttribute = new NSString(NSAccessibilitySelectedAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySelectedChildrenAttribute();
+public static final native long NSAccessibilitySelectedChildrenAttribute();
 public static final NSString NSAccessibilitySelectedChildrenAttribute = new NSString(NSAccessibilitySelectedChildrenAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySelectedChildrenChangedNotification();
+public static final native long NSAccessibilitySelectedChildrenChangedNotification();
 public static final NSString NSAccessibilitySelectedChildrenChangedNotification = new NSString(NSAccessibilitySelectedChildrenChangedNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySelectedColumnsAttribute();
+public static final native long NSAccessibilitySelectedColumnsAttribute();
 public static final NSString NSAccessibilitySelectedColumnsAttribute = new NSString(NSAccessibilitySelectedColumnsAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySelectedRowsAttribute();
+public static final native long NSAccessibilitySelectedRowsAttribute();
 public static final NSString NSAccessibilitySelectedRowsAttribute = new NSString(NSAccessibilitySelectedRowsAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySelectedRowsChangedNotification();
+public static final native long NSAccessibilitySelectedRowsChangedNotification();
 public static final NSString NSAccessibilitySelectedRowsChangedNotification = new NSString(NSAccessibilitySelectedRowsChangedNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySelectedTextAttribute();
+public static final native long NSAccessibilitySelectedTextAttribute();
 public static final NSString NSAccessibilitySelectedTextAttribute = new NSString(NSAccessibilitySelectedTextAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySelectedTextChangedNotification();
+public static final native long NSAccessibilitySelectedTextChangedNotification();
 public static final NSString NSAccessibilitySelectedTextChangedNotification = new NSString(NSAccessibilitySelectedTextChangedNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySelectedTextRangeAttribute();
+public static final native long NSAccessibilitySelectedTextRangeAttribute();
 public static final NSString NSAccessibilitySelectedTextRangeAttribute = new NSString(NSAccessibilitySelectedTextRangeAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySelectedTextRangesAttribute();
+public static final native long NSAccessibilitySelectedTextRangesAttribute();
 public static final NSString NSAccessibilitySelectedTextRangesAttribute = new NSString(NSAccessibilitySelectedTextRangesAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityServesAsTitleForUIElementsAttribute();
+public static final native long NSAccessibilityServesAsTitleForUIElementsAttribute();
 public static final NSString NSAccessibilityServesAsTitleForUIElementsAttribute = new NSString(NSAccessibilityServesAsTitleForUIElementsAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityShowMenuAction();
+public static final native long NSAccessibilityShowMenuAction();
 public static final NSString NSAccessibilityShowMenuAction = new NSString(NSAccessibilityShowMenuAction());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySizeAttribute();
+public static final native long NSAccessibilitySizeAttribute();
 public static final NSString NSAccessibilitySizeAttribute = new NSString(NSAccessibilitySizeAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySliderRole();
+public static final native long NSAccessibilitySliderRole();
 public static final NSString NSAccessibilitySliderRole = new NSString(NSAccessibilitySliderRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySortButtonRole();
+public static final native long NSAccessibilitySortButtonRole();
 public static final NSString NSAccessibilitySortButtonRole = new NSString(NSAccessibilitySortButtonRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySplitterRole();
+public static final native long NSAccessibilitySplitterRole();
 public static final NSString NSAccessibilitySplitterRole = new NSString(NSAccessibilitySplitterRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityStandardWindowSubrole();
+public static final native long NSAccessibilityStandardWindowSubrole();
 public static final NSString NSAccessibilityStandardWindowSubrole = new NSString(NSAccessibilityStandardWindowSubrole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityStaticTextRole();
+public static final native long NSAccessibilityStaticTextRole();
 public static final NSString NSAccessibilityStaticTextRole = new NSString(NSAccessibilityStaticTextRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityStrikethroughColorTextAttribute();
+public static final native long NSAccessibilityStrikethroughColorTextAttribute();
 public static final NSString NSAccessibilityStrikethroughColorTextAttribute = new NSString(NSAccessibilityStrikethroughColorTextAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityStrikethroughTextAttribute();
+public static final native long NSAccessibilityStrikethroughTextAttribute();
 public static final NSString NSAccessibilityStrikethroughTextAttribute = new NSString(NSAccessibilityStrikethroughTextAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityStringForRangeParameterizedAttribute();
+public static final native long NSAccessibilityStringForRangeParameterizedAttribute();
 public static final NSString NSAccessibilityStringForRangeParameterizedAttribute = new NSString(NSAccessibilityStringForRangeParameterizedAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityStyleRangeForIndexParameterizedAttribute();
+public static final native long NSAccessibilityStyleRangeForIndexParameterizedAttribute();
 public static final NSString NSAccessibilityStyleRangeForIndexParameterizedAttribute = new NSString(NSAccessibilityStyleRangeForIndexParameterizedAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySubroleAttribute();
+public static final native long NSAccessibilitySubroleAttribute();
 public static final NSString NSAccessibilitySubroleAttribute = new NSString(NSAccessibilitySubroleAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySuperscriptTextAttribute();
+public static final native long NSAccessibilitySuperscriptTextAttribute();
 public static final NSString NSAccessibilitySuperscriptTextAttribute = new NSString(NSAccessibilitySuperscriptTextAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilitySystemDialogSubrole();
+public static final native long NSAccessibilitySystemDialogSubrole();
 public static final NSString NSAccessibilitySystemDialogSubrole = new NSString(NSAccessibilitySystemDialogSubrole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityTabGroupRole();
+public static final native long NSAccessibilityTabGroupRole();
 public static final NSString NSAccessibilityTabGroupRole = new NSString(NSAccessibilityTabGroupRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityTableRole();
+public static final native long NSAccessibilityTableRole();
 public static final NSString NSAccessibilityTableRole = new NSString(NSAccessibilityTableRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityTableRowSubrole();
+public static final native long NSAccessibilityTableRowSubrole();
 public static final NSString NSAccessibilityTableRowSubrole = new NSString(NSAccessibilityTableRowSubrole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityTabsAttribute();
+public static final native long NSAccessibilityTabsAttribute();
 public static final NSString NSAccessibilityTabsAttribute = new NSString(NSAccessibilityTabsAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityTextAreaRole();
+public static final native long NSAccessibilityTextAreaRole();
 public static final NSString NSAccessibilityTextAreaRole = new NSString(NSAccessibilityTextAreaRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityTextFieldRole();
+public static final native long NSAccessibilityTextFieldRole();
 public static final NSString NSAccessibilityTextFieldRole = new NSString(NSAccessibilityTextFieldRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityTextLinkSubrole();
+public static final native long NSAccessibilityTextLinkSubrole();
 public static final NSString NSAccessibilityTextLinkSubrole = new NSString(NSAccessibilityTextLinkSubrole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityTitleAttribute();
+public static final native long NSAccessibilityTitleAttribute();
 public static final NSString NSAccessibilityTitleAttribute = new NSString(NSAccessibilityTitleAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityTitleChangedNotification();
+public static final native long NSAccessibilityTitleChangedNotification();
 public static final NSString NSAccessibilityTitleChangedNotification = new NSString(NSAccessibilityTitleChangedNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityTitleUIElementAttribute();
+public static final native long NSAccessibilityTitleUIElementAttribute();
 public static final NSString NSAccessibilityTitleUIElementAttribute = new NSString(NSAccessibilityTitleUIElementAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityToolbarRole();
+public static final native long NSAccessibilityToolbarRole();
 public static final NSString NSAccessibilityToolbarRole = new NSString(NSAccessibilityToolbarRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityTopLevelUIElementAttribute();
+public static final native long NSAccessibilityTopLevelUIElementAttribute();
 public static final NSString NSAccessibilityTopLevelUIElementAttribute = new NSString(NSAccessibilityTopLevelUIElementAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityURLAttribute();
+public static final native long NSAccessibilityURLAttribute();
 public static final NSString NSAccessibilityURLAttribute = new NSString(NSAccessibilityURLAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityUnderlineColorTextAttribute();
+public static final native long NSAccessibilityUnderlineColorTextAttribute();
 public static final NSString NSAccessibilityUnderlineColorTextAttribute = new NSString(NSAccessibilityUnderlineColorTextAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityUnderlineTextAttribute();
+public static final native long NSAccessibilityUnderlineTextAttribute();
 public static final NSString NSAccessibilityUnderlineTextAttribute = new NSString(NSAccessibilityUnderlineTextAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityUnknownRole();
+public static final native long NSAccessibilityUnknownRole();
 public static final NSString NSAccessibilityUnknownRole = new NSString(NSAccessibilityUnknownRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityUnknownSubrole();
+public static final native long NSAccessibilityUnknownSubrole();
 public static final NSString NSAccessibilityUnknownSubrole = new NSString(NSAccessibilityUnknownSubrole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityValueAttribute();
+public static final native long NSAccessibilityValueAttribute();
 public static final NSString NSAccessibilityValueAttribute = new NSString(NSAccessibilityValueAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityValueChangedNotification();
+public static final native long NSAccessibilityValueChangedNotification();
 public static final NSString NSAccessibilityValueChangedNotification = new NSString(NSAccessibilityValueChangedNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityValueDescriptionAttribute();
+public static final native long NSAccessibilityValueDescriptionAttribute();
 public static final NSString NSAccessibilityValueDescriptionAttribute = new NSString(NSAccessibilityValueDescriptionAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityValueIndicatorRole();
+public static final native long NSAccessibilityValueIndicatorRole();
 public static final NSString NSAccessibilityValueIndicatorRole = new NSString(NSAccessibilityValueIndicatorRole());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityVerticalOrientationValue();
+public static final native long NSAccessibilityVerticalOrientationValue();
 public static final NSString NSAccessibilityVerticalOrientationValue = new NSString(NSAccessibilityVerticalOrientationValue());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityVerticalScrollBarAttribute();
+public static final native long NSAccessibilityVerticalScrollBarAttribute();
 public static final NSString NSAccessibilityVerticalScrollBarAttribute = new NSString(NSAccessibilityVerticalScrollBarAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityVisibleCharacterRangeAttribute();
+public static final native long NSAccessibilityVisibleCharacterRangeAttribute();
 public static final NSString NSAccessibilityVisibleCharacterRangeAttribute = new NSString(NSAccessibilityVisibleCharacterRangeAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityVisibleChildrenAttribute();
+public static final native long NSAccessibilityVisibleChildrenAttribute();
 public static final NSString NSAccessibilityVisibleChildrenAttribute = new NSString(NSAccessibilityVisibleChildrenAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityVisibleColumnsAttribute();
+public static final native long NSAccessibilityVisibleColumnsAttribute();
 public static final NSString NSAccessibilityVisibleColumnsAttribute = new NSString(NSAccessibilityVisibleColumnsAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityVisibleNameKey();
+public static final native long NSAccessibilityVisibleNameKey();
 public static final NSString NSAccessibilityVisibleNameKey = new NSString(NSAccessibilityVisibleNameKey());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityVisibleRowsAttribute();
+public static final native long NSAccessibilityVisibleRowsAttribute();
 public static final NSString NSAccessibilityVisibleRowsAttribute = new NSString(NSAccessibilityVisibleRowsAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityWindowAttribute();
+public static final native long NSAccessibilityWindowAttribute();
 public static final NSString NSAccessibilityWindowAttribute = new NSString(NSAccessibilityWindowAttribute());
 /** @method flags=const */
-public static final native long /*int*/ NSAccessibilityWindowRole();
+public static final native long NSAccessibilityWindowRole();
 public static final NSString NSAccessibilityWindowRole = new NSString(NSAccessibilityWindowRole());
 /** @method flags=const */
-public static final native long /*int*/ NSApplicationDidChangeScreenParametersNotification();
+public static final native long NSApplicationDidChangeScreenParametersNotification();
 public static final NSString NSApplicationDidChangeScreenParametersNotification = new NSString(NSApplicationDidChangeScreenParametersNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSAttachmentAttributeName();
+public static final native long NSAttachmentAttributeName();
 public static final NSString NSAttachmentAttributeName = new NSString(NSAttachmentAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSBackgroundColorAttributeName();
+public static final native long NSBackgroundColorAttributeName();
 public static final NSString NSBackgroundColorAttributeName = new NSString(NSBackgroundColorAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSBaselineOffsetAttributeName();
+public static final native long NSBaselineOffsetAttributeName();
 public static final NSString NSBaselineOffsetAttributeName = new NSString(NSBaselineOffsetAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSCalibratedRGBColorSpace();
+public static final native long NSCalibratedRGBColorSpace();
 public static final NSString NSCalibratedRGBColorSpace = new NSString(NSCalibratedRGBColorSpace());
 /** @method flags=const */
-public static final native long /*int*/ NSCursorAttributeName();
+public static final native long NSCursorAttributeName();
 public static final NSString NSCursorAttributeName = new NSString(NSCursorAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSDeviceRGBColorSpace();
+public static final native long NSDeviceRGBColorSpace();
 public static final NSString NSDeviceRGBColorSpace = new NSString(NSDeviceRGBColorSpace());
 /** @method flags=const */
-public static final native long /*int*/ NSDeviceResolution();
+public static final native long NSDeviceResolution();
 public static final NSString NSDeviceResolution = new NSString(NSDeviceResolution());
 /** @method flags=const */
-public static final native long /*int*/ NSDragPboard();
+public static final native long NSDragPboard();
 public static final NSString NSDragPboard = new NSString(NSDragPboard());
 /** @method flags=const */
-public static final native long /*int*/ NSEventTrackingRunLoopMode();
+public static final native long NSEventTrackingRunLoopMode();
 public static final NSString NSEventTrackingRunLoopMode = new NSString(NSEventTrackingRunLoopMode());
 /** @method flags=const */
-public static final native long /*int*/ NSFilenamesPboardType();
+public static final native long NSFilenamesPboardType();
 public static final NSString NSFilenamesPboardType = new NSString(NSFilenamesPboardType());
 /** @method flags=const */
-public static final native long /*int*/ NSFontAttributeName();
+public static final native long NSFontAttributeName();
 public static final NSString NSFontAttributeName = new NSString(NSFontAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSForegroundColorAttributeName();
+public static final native long NSForegroundColorAttributeName();
 public static final NSString NSForegroundColorAttributeName = new NSString(NSForegroundColorAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSLigatureAttributeName();
+public static final native long NSLigatureAttributeName();
 public static final NSString NSLigatureAttributeName = new NSString(NSLigatureAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSLinkAttributeName();
+public static final native long NSLinkAttributeName();
 public static final NSString NSLinkAttributeName = new NSString(NSLinkAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSModalPanelRunLoopMode();
+public static final native long NSModalPanelRunLoopMode();
 public static final NSString NSModalPanelRunLoopMode = new NSString(NSModalPanelRunLoopMode());
 /** @method flags=const */
-public static final native long /*int*/ NSObliquenessAttributeName();
+public static final native long NSObliquenessAttributeName();
 public static final NSString NSObliquenessAttributeName = new NSString(NSObliquenessAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSOutlineViewColumnDidMoveNotification();
+public static final native long NSOutlineViewColumnDidMoveNotification();
 public static final NSString NSOutlineViewColumnDidMoveNotification = new NSString(NSOutlineViewColumnDidMoveNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSParagraphStyleAttributeName();
+public static final native long NSParagraphStyleAttributeName();
 public static final NSString NSParagraphStyleAttributeName = new NSString(NSParagraphStyleAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSPasteboardTypeHTML();
+public static final native long NSPasteboardTypeHTML();
 public static final NSString NSPasteboardTypeHTML = new NSString(NSPasteboardTypeHTML());
 /** @method flags=const */
-public static final native long /*int*/ NSPasteboardTypeRTF();
+public static final native long NSPasteboardTypeRTF();
 public static final NSString NSPasteboardTypeRTF = new NSString(NSPasteboardTypeRTF());
 /** @method flags=const */
-public static final native long /*int*/ NSPasteboardTypeString();
+public static final native long NSPasteboardTypeString();
 public static final NSString NSPasteboardTypeString = new NSString(NSPasteboardTypeString());
 /** @method flags=const */
-public static final native long /*int*/ NSPrintAllPages();
+public static final native long NSPrintAllPages();
 public static final NSString NSPrintAllPages = new NSString(NSPrintAllPages());
 /** @method flags=const */
-public static final native long /*int*/ NSPrintCopies();
+public static final native long NSPrintCopies();
 public static final NSString NSPrintCopies = new NSString(NSPrintCopies());
 /** @method flags=const */
-public static final native long /*int*/ NSPrintFirstPage();
+public static final native long NSPrintFirstPage();
 public static final NSString NSPrintFirstPage = new NSString(NSPrintFirstPage());
 /** @method flags=const */
-public static final native long /*int*/ NSPrintJobDisposition();
+public static final native long NSPrintJobDisposition();
 public static final NSString NSPrintJobDisposition = new NSString(NSPrintJobDisposition());
 /** @method flags=const */
-public static final native long /*int*/ NSPrintLastPage();
+public static final native long NSPrintLastPage();
 public static final NSString NSPrintLastPage = new NSString(NSPrintLastPage());
 /** @method flags=const */
-public static final native long /*int*/ NSPrintMustCollate();
+public static final native long NSPrintMustCollate();
 public static final NSString NSPrintMustCollate = new NSString(NSPrintMustCollate());
 /** @method flags=const */
-public static final native long /*int*/ NSPrintOrientation();
+public static final native long NSPrintOrientation();
 public static final NSString NSPrintOrientation = new NSString(NSPrintOrientation());
 /** @method flags=const */
-public static final native long /*int*/ NSPrintPreviewJob();
+public static final native long NSPrintPreviewJob();
 public static final NSString NSPrintPreviewJob = new NSString(NSPrintPreviewJob());
 /** @method flags=const */
-public static final native long /*int*/ NSPrintSaveJob();
+public static final native long NSPrintSaveJob();
 public static final NSString NSPrintSaveJob = new NSString(NSPrintSaveJob());
 /** @method flags=const */
-public static final native long /*int*/ NSPrintSavePath();
+public static final native long NSPrintSavePath();
 public static final NSString NSPrintSavePath = new NSString(NSPrintSavePath());
 /** @method flags=const */
-public static final native long /*int*/ NSPrintScalingFactor();
+public static final native long NSPrintScalingFactor();
 public static final NSString NSPrintScalingFactor = new NSString(NSPrintScalingFactor());
 /** @method flags=const */
-public static final native long /*int*/ NSPrintSpoolJob();
+public static final native long NSPrintSpoolJob();
 public static final NSString NSPrintSpoolJob = new NSString(NSPrintSpoolJob());
 /** @method flags=const */
-public static final native long /*int*/ NSSpellingStateAttributeName();
+public static final native long NSSpellingStateAttributeName();
 public static final NSString NSSpellingStateAttributeName = new NSString(NSSpellingStateAttributeName());
 /** @method flags=const */
-public static final native double /*float*/ NSSquareStatusItemLength();
+public static final native double NSSquareStatusItemLength();
 /** @method flags=const */
-public static final native long /*int*/ NSStrikethroughColorAttributeName();
+public static final native long NSStrikethroughColorAttributeName();
 public static final NSString NSStrikethroughColorAttributeName = new NSString(NSStrikethroughColorAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSStrikethroughStyleAttributeName();
+public static final native long NSStrikethroughStyleAttributeName();
 public static final NSString NSStrikethroughStyleAttributeName = new NSString(NSStrikethroughStyleAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSStrokeWidthAttributeName();
+public static final native long NSStrokeWidthAttributeName();
 public static final NSString NSStrokeWidthAttributeName = new NSString(NSStrokeWidthAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSSystemColorsDidChangeNotification();
+public static final native long NSSystemColorsDidChangeNotification();
 public static final NSString NSSystemColorsDidChangeNotification = new NSString(NSSystemColorsDidChangeNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSTIFFPboardType();
+public static final native long NSTIFFPboardType();
 public static final NSString NSTIFFPboardType = new NSString(NSTIFFPboardType());
 /** @method flags=const */
-public static final native long /*int*/ NSTableViewColumnDidMoveNotification();
+public static final native long NSTableViewColumnDidMoveNotification();
 public static final NSString NSTableViewColumnDidMoveNotification = new NSString(NSTableViewColumnDidMoveNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSToolbarCustomizeToolbarItemIdentifier();
+public static final native long NSToolbarCustomizeToolbarItemIdentifier();
 public static final NSString NSToolbarCustomizeToolbarItemIdentifier = new NSString(NSToolbarCustomizeToolbarItemIdentifier());
 /** @method flags=const */
-public static final native long /*int*/ NSToolbarDidRemoveItemNotification();
+public static final native long NSToolbarDidRemoveItemNotification();
 public static final NSString NSToolbarDidRemoveItemNotification = new NSString(NSToolbarDidRemoveItemNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSToolbarFlexibleSpaceItemIdentifier();
+public static final native long NSToolbarFlexibleSpaceItemIdentifier();
 public static final NSString NSToolbarFlexibleSpaceItemIdentifier = new NSString(NSToolbarFlexibleSpaceItemIdentifier());
 /** @method flags=const */
-public static final native long /*int*/ NSToolbarPrintItemIdentifier();
+public static final native long NSToolbarPrintItemIdentifier();
 public static final NSString NSToolbarPrintItemIdentifier = new NSString(NSToolbarPrintItemIdentifier());
 /** @method flags=const */
-public static final native long /*int*/ NSToolbarSeparatorItemIdentifier();
+public static final native long NSToolbarSeparatorItemIdentifier();
 public static final NSString NSToolbarSeparatorItemIdentifier = new NSString(NSToolbarSeparatorItemIdentifier());
 /** @method flags=const */
-public static final native long /*int*/ NSToolbarShowColorsItemIdentifier();
+public static final native long NSToolbarShowColorsItemIdentifier();
 public static final NSString NSToolbarShowColorsItemIdentifier = new NSString(NSToolbarShowColorsItemIdentifier());
 /** @method flags=const */
-public static final native long /*int*/ NSToolbarShowFontsItemIdentifier();
+public static final native long NSToolbarShowFontsItemIdentifier();
 public static final NSString NSToolbarShowFontsItemIdentifier = new NSString(NSToolbarShowFontsItemIdentifier());
 /** @method flags=const */
-public static final native long /*int*/ NSToolbarSpaceItemIdentifier();
+public static final native long NSToolbarSpaceItemIdentifier();
 public static final NSString NSToolbarSpaceItemIdentifier = new NSString(NSToolbarSpaceItemIdentifier());
 /** @method flags=const */
-public static final native long /*int*/ NSToolbarWillAddItemNotification();
+public static final native long NSToolbarWillAddItemNotification();
 public static final NSString NSToolbarWillAddItemNotification = new NSString(NSToolbarWillAddItemNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSURLPboardType();
+public static final native long NSURLPboardType();
 public static final NSString NSURLPboardType = new NSString(NSURLPboardType());
 /** @method flags=const */
-public static final native long /*int*/ NSUnderlineColorAttributeName();
+public static final native long NSUnderlineColorAttributeName();
 public static final NSString NSUnderlineColorAttributeName = new NSString(NSUnderlineColorAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSUnderlineStyleAttributeName();
+public static final native long NSUnderlineStyleAttributeName();
 public static final NSString NSUnderlineStyleAttributeName = new NSString(NSUnderlineStyleAttributeName());
 /** @method flags=const */
-public static final native long /*int*/ NSViewGlobalFrameDidChangeNotification();
+public static final native long NSViewGlobalFrameDidChangeNotification();
 public static final NSString NSViewGlobalFrameDidChangeNotification = new NSString(NSViewGlobalFrameDidChangeNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSWindowDidBecomeKeyNotification();
+public static final native long NSWindowDidBecomeKeyNotification();
 public static final NSString NSWindowDidBecomeKeyNotification = new NSString(NSWindowDidBecomeKeyNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSWindowDidDeminiaturizeNotification();
+public static final native long NSWindowDidDeminiaturizeNotification();
 public static final NSString NSWindowDidDeminiaturizeNotification = new NSString(NSWindowDidDeminiaturizeNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSWindowDidMiniaturizeNotification();
+public static final native long NSWindowDidMiniaturizeNotification();
 public static final NSString NSWindowDidMiniaturizeNotification = new NSString(NSWindowDidMiniaturizeNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSWindowDidMoveNotification();
+public static final native long NSWindowDidMoveNotification();
 public static final NSString NSWindowDidMoveNotification = new NSString(NSWindowDidMoveNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSWindowDidResignKeyNotification();
+public static final native long NSWindowDidResignKeyNotification();
 public static final NSString NSWindowDidResignKeyNotification = new NSString(NSWindowDidResignKeyNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSWindowDidResizeNotification();
+public static final native long NSWindowDidResizeNotification();
 public static final NSString NSWindowDidResizeNotification = new NSString(NSWindowDidResizeNotification());
 /** @method flags=const */
-public static final native long /*int*/ NSWindowWillCloseNotification();
+public static final native long NSWindowWillCloseNotification();
 public static final NSString NSWindowWillCloseNotification = new NSString(NSWindowWillCloseNotification());
 /** @method flags=const */
-public static final native long /*int*/ kCFAllocatorDefault();
+public static final native long kCFAllocatorDefault();
 /** @method flags=const */
-public static final native long /*int*/ kCFRunLoopCommonModes();
+public static final native long kCFRunLoopCommonModes();
 /** @method flags=const */
-public static final native long /*int*/ kCTFontAttributeName();
+public static final native long kCTFontAttributeName();
 /** @method flags=const */
-public static final native long /*int*/ kCTForegroundColorAttributeName();
+public static final native long kCTForegroundColorAttributeName();
 /** @method flags=const */
-public static final native long /*int*/ kCTParagraphStyleAttributeName();
+public static final native long kCTParagraphStyleAttributeName();
 /** @method flags=const */
-public static final native long /*int*/ NSDefaultRunLoopMode();
+public static final native long NSDefaultRunLoopMode();
 public static final NSString NSDefaultRunLoopMode = new NSString(NSDefaultRunLoopMode());
 /** @method flags=const */
-public static final native long /*int*/ NSErrorFailingURLStringKey();
+public static final native long NSErrorFailingURLStringKey();
 public static final NSString NSErrorFailingURLStringKey = new NSString(NSErrorFailingURLStringKey());
 /** @method flags=const */
-public static final native long /*int*/ NSLocaleLanguageCode();
+public static final native long NSLocaleLanguageCode();
 public static final NSString NSLocaleLanguageCode = new NSString(NSLocaleLanguageCode());
 /** @method flags=const */
-public static final native long /*int*/ NSNotFound();
+public static final native long NSNotFound();
 
 /** Functions */
 
 /**
  * @param action cast=(NSString*)
  */
-public static final native long /*int*/ NSAccessibilityActionDescription(long /*int*/ action);
+public static final native long NSAccessibilityActionDescription(long action);
 /**
  * @param element cast=(id)
  * @param notification cast=(NSString*)
  */
-public static final native void NSAccessibilityPostNotification(long /*int*/ element, long /*int*/ notification);
+public static final native void NSAccessibilityPostNotification(long element, long notification);
 /**
  * @param element cast=(id)
  * @param attribute cast=(NSString*)
  * @param value cast=(id)
  */
-public static final native void NSAccessibilityRaiseBadArgumentException(long /*int*/ element, long /*int*/ attribute, long /*int*/ value);
+public static final native void NSAccessibilityRaiseBadArgumentException(long element, long attribute, long value);
 /**
  * @param role cast=(NSString*)
  * @param subrole cast=(NSString*)
  */
-public static final native long /*int*/ NSAccessibilityRoleDescription(long /*int*/ role, long /*int*/ subrole);
+public static final native long NSAccessibilityRoleDescription(long role, long subrole);
 /**
  * @param element cast=(id)
  */
-public static final native long /*int*/ NSAccessibilityRoleDescriptionForUIElement(long /*int*/ element);
+public static final native long NSAccessibilityRoleDescriptionForUIElement(long element);
 /**
  * @param element cast=(id)
  */
-public static final native long /*int*/ NSAccessibilityUnignoredAncestor(long /*int*/ element);
+public static final native long NSAccessibilityUnignoredAncestor(long element);
 /**
  * @param originalChildren cast=(NSArray*)
  */
-public static final native long /*int*/ NSAccessibilityUnignoredChildren(long /*int*/ originalChildren);
+public static final native long NSAccessibilityUnignoredChildren(long originalChildren);
 /**
  * @param originalChild cast=(id)
  */
-public static final native long /*int*/ NSAccessibilityUnignoredChildrenForOnlyChild(long /*int*/ originalChild);
+public static final native long NSAccessibilityUnignoredChildrenForOnlyChild(long originalChild);
 /**
  * @param element cast=(id)
  */
-public static final native long /*int*/ NSAccessibilityUnignoredDescendant(long /*int*/ element);
+public static final native long NSAccessibilityUnignoredDescendant(long element);
 public static final native void NSBeep();
 /**
  * @param depth cast=(NSWindowDepth)
  */
-public static final native long /*int*/ NSBitsPerPixelFromDepth(int depth);
+public static final native long NSBitsPerPixelFromDepth(int depth);
 /**
  * @param count cast=(NSInteger*)
  */
-public static final native void NSCountWindows(long[] /*int[]*/ count);
+public static final native void NSCountWindows(long[] count);
 /**
  * @param colorSpaceName cast=(NSString*)
  */
-public static final native long /*int*/ NSNumberOfColorComponents(long /*int*/ colorSpaceName);
+public static final native long NSNumberOfColorComponents(long colorSpaceName);
 /**
  * @param aRect flags=struct
  * @param op cast=(NSCompositingOperation)
  */
-public static final native void NSRectFillUsingOperation(NSRect aRect, long /*int*/ op);
+public static final native void NSRectFillUsingOperation(NSRect aRect, long op);
 /**
  * @param alloc cast=(CFAllocatorRef)
  * @param str cast=(CFStringRef)
  * @param attributes cast=(CFDictionaryRef)
  */
-public static final native long /*int*/ CFAttributedStringCreate(long /*int*/ alloc, long /*int*/ str, long /*int*/ attributes);
+public static final native long CFAttributedStringCreate(long alloc, long str, long attributes);
 /**
  * @param theData cast=(CFDataRef)
  */
-public static final native long /*int*/ CFDataGetBytePtr(long /*int*/ theData);
+public static final native long CFDataGetBytePtr(long theData);
 /**
  * @param theData cast=(CFDataRef)
  */
-public static final native long /*int*/ CFDataGetLength(long /*int*/ theData);
+public static final native long CFDataGetLength(long theData);
 /**
  * @param theDict cast=(CFMutableDictionaryRef)
  * @param key cast=(void*)
  * @param value cast=(void*)
  */
-public static final native void CFDictionaryAddValue(long /*int*/ theDict, long /*int*/ key, long /*int*/ value);
+public static final native void CFDictionaryAddValue(long theDict, long key, long value);
 /**
  * @param allocator cast=(CFAllocatorRef)
  * @param capacity cast=(CFIndex)
  * @param keyCallBacks cast=(CFDictionaryKeyCallBacks*)
  * @param valueCallBacks cast=(CFDictionaryValueCallBacks*)
  */
-public static final native long /*int*/ CFDictionaryCreateMutable(long /*int*/ allocator, long /*int*/ capacity, long /*int*/ keyCallBacks, long /*int*/ valueCallBacks);
+public static final native long CFDictionaryCreateMutable(long allocator, long capacity, long keyCallBacks, long valueCallBacks);
 /**
  * @param cf cast=(CFTypeRef)
  */
-public static final native void CFRelease(long /*int*/ cf);
+public static final native void CFRelease(long cf);
 /**
  * @param rl cast=(CFRunLoopRef)
  * @param observer cast=(CFRunLoopObserverRef)
  * @param mode cast=(CFStringRef)
  */
-public static final native void CFRunLoopAddObserver(long /*int*/ rl, long /*int*/ observer, long /*int*/ mode);
-public static final native long /*int*/ CFRunLoopGetCurrent();
+public static final native void CFRunLoopAddObserver(long rl, long observer, long mode);
+public static final native long CFRunLoopGetCurrent();
 /**
  * @param allocator cast=(CFAllocatorRef)
  * @param activities cast=(CFOptionFlags)
@@ -3393,32 +3393,32 @@ public static final native long /*int*/ CFRunLoopGetCurrent();
  * @param callout cast=(CFRunLoopObserverCallBack)
  * @param context cast=(CFRunLoopObserverContext*)
  */
-public static final native long /*int*/ CFRunLoopObserverCreate(long /*int*/ allocator, long /*int*/ activities, boolean repeats, long /*int*/ order, long /*int*/ callout, long /*int*/ context);
+public static final native long CFRunLoopObserverCreate(long allocator, long activities, boolean repeats, long order, long callout, long context);
 /**
  * @param observer cast=(CFRunLoopObserverRef)
  */
-public static final native void CFRunLoopObserverInvalidate(long /*int*/ observer);
+public static final native void CFRunLoopObserverInvalidate(long observer);
 /**
  * @param mode cast=(CFStringRef)
  * @param seconds cast=(CFTimeInterval)
  * @param returnAfterSourceHandled cast=(Boolean)
  */
-public static final native int CFRunLoopRunInMode(long /*int*/ mode, double seconds, boolean returnAfterSourceHandled);
+public static final native int CFRunLoopRunInMode(long mode, double seconds, boolean returnAfterSourceHandled);
 /**
  * @param rl cast=(CFRunLoopRef)
  */
-public static final native void CFRunLoopStop(long /*int*/ rl);
+public static final native void CFRunLoopStop(long rl);
 /**
  * @param alloc cast=(CFAllocatorRef)
  * @param chars cast=(UniChar*)
  * @param numChars cast=(CFIndex)
  */
-public static final native long /*int*/ CFStringCreateWithCharacters(long /*int*/ alloc, char[] chars, long /*int*/ numChars);
+public static final native long CFStringCreateWithCharacters(long alloc, char[] chars, long numChars);
 /**
  * @param allocator cast=(CFAllocatorRef)
  * @param fsRef cast=(FSRef*)
  */
-public static final native long /*int*/ CFURLCreateFromFSRef(long /*int*/ allocator, byte[] fsRef);
+public static final native long CFURLCreateFromFSRef(long allocator, byte[] fsRef);
 /**
  * @param allocator cast=(CFAllocatorRef)
  * @param originalString cast=(CFStringRef)
@@ -3426,7 +3426,7 @@ public static final native long /*int*/ CFURLCreateFromFSRef(long /*int*/ alloca
  * @param legalURLCharactersToBeEscaped cast=(CFStringRef)
  * @param encoding cast=(CFStringEncoding)
  */
-public static final native long /*int*/ CFURLCreateStringByAddingPercentEscapes(long /*int*/ allocator, long /*int*/ originalString, long /*int*/ charactersToLeaveUnescaped, long /*int*/ legalURLCharactersToBeEscaped, int encoding);
+public static final native long CFURLCreateStringByAddingPercentEscapes(long allocator, long originalString, long charactersToLeaveUnescaped, long legalURLCharactersToBeEscaped, int encoding);
 /**
  * @param data cast=(void*)
  * @param width cast=(size_t)
@@ -3436,210 +3436,210 @@ public static final native long /*int*/ CFURLCreateStringByAddingPercentEscapes(
  * @param colorspace cast=(CGColorSpaceRef)
  * @param bitmapInfo cast=(CGBitmapInfo)
  */
-public static final native long /*int*/ CGBitmapContextCreate(long /*int*/ data, long /*int*/ width, long /*int*/ height, long /*int*/ bitsPerComponent, long /*int*/ bytesPerRow, long /*int*/ colorspace, int bitmapInfo);
+public static final native long CGBitmapContextCreate(long data, long width, long height, long bitsPerComponent, long bytesPerRow, long colorspace, int bitmapInfo);
 /**
  * @param c cast=(CGContextRef)
  */
-public static final native long /*int*/ CGBitmapContextCreateImage(long /*int*/ c);
+public static final native long CGBitmapContextCreateImage(long c);
 /**
  * @param c cast=(CGContextRef)
  */
-public static final native long /*int*/ CGBitmapContextGetData(long /*int*/ c);
+public static final native long CGBitmapContextGetData(long c);
 /**
  * @param space cast=(CGColorSpaceRef)
  * @param components cast=(CGFloat*)
  */
-public static final native long /*int*/ CGColorCreate(long /*int*/ space, double[] /*float[]*/ components);
+public static final native long CGColorCreate(long space, double[] components);
 /**
  * @param color cast=(CGColorRef)
  */
-public static final native void CGColorRelease(long /*int*/ color);
-public static final native long /*int*/ CGColorSpaceCreateDeviceRGB();
+public static final native void CGColorRelease(long color);
+public static final native long CGColorSpaceCreateDeviceRGB();
 /**
  * @param space cast=(CGColorSpaceRef)
  */
-public static final native void CGColorSpaceRelease(long /*int*/ space);
+public static final native void CGColorSpaceRelease(long space);
 /**
  * @param context cast=(CGContextRef)
  * @param path cast=(CGPathRef)
  */
-public static final native void CGContextAddPath(long /*int*/ context, long /*int*/ path);
+public static final native void CGContextAddPath(long context, long path);
 /**
  * @param context cast=(CGContextRef)
  * @param rect flags=struct
  * @param auxiliaryInfo cast=(CFDictionaryRef)
  */
-public static final native void CGContextBeginTransparencyLayerWithRect(long /*int*/ context, CGRect rect, long /*int*/ auxiliaryInfo);
+public static final native void CGContextBeginTransparencyLayerWithRect(long context, CGRect rect, long auxiliaryInfo);
 /**
  * @param c cast=(CGContextRef)
  * @param rect flags=struct
  * @param image cast=(CGImageRef)
  */
-public static final native void CGContextDrawImage(long /*int*/ c, CGRect rect, long /*int*/ image);
+public static final native void CGContextDrawImage(long c, CGRect rect, long image);
 /**
  * @param context cast=(CGContextRef)
  */
-public static final native void CGContextEndTransparencyLayer(long /*int*/ context);
+public static final native void CGContextEndTransparencyLayer(long context);
 /**
  * @param c cast=(CGContextRef)
  * @param rect flags=struct
  */
-public static final native void CGContextFillRect(long /*int*/ c, CGRect rect);
+public static final native void CGContextFillRect(long c, CGRect rect);
 /**
  * @param c cast=(CGContextRef)
  */
-public static final native void CGContextRelease(long /*int*/ c);
+public static final native void CGContextRelease(long c);
 /**
  * @param c cast=(CGContextRef)
  */
-public static final native void CGContextReplacePathWithStrokedPath(long /*int*/ c);
+public static final native void CGContextReplacePathWithStrokedPath(long c);
 /**
  * @param c cast=(CGContextRef)
  */
-public static final native void CGContextRestoreGState(long /*int*/ c);
+public static final native void CGContextRestoreGState(long c);
 /**
  * @param c cast=(CGContextRef)
  */
-public static final native void CGContextSaveGState(long /*int*/ c);
+public static final native void CGContextSaveGState(long c);
 /**
  * @param c cast=(CGContextRef)
  * @param sx cast=(CGFloat)
  * @param sy cast=(CGFloat)
  */
-public static final native void CGContextScaleCTM(long /*int*/ c, double /*float*/ sx, double /*float*/ sy);
+public static final native void CGContextScaleCTM(long c, double sx, double sy);
 /**
  * @param context cast=(CGContextRef)
  * @param mode cast=(CGBlendMode)
  */
-public static final native void CGContextSetBlendMode(long /*int*/ context, int mode);
+public static final native void CGContextSetBlendMode(long context, int mode);
 /**
  * @param c cast=(CGContextRef)
  * @param components cast=(CGFloat*)
  */
-public static final native void CGContextSetFillColor(long /*int*/ c, double[] /*float[]*/ components);
+public static final native void CGContextSetFillColor(long c, double[] components);
 /**
  * @param c cast=(CGContextRef)
  * @param colorspace cast=(CGColorSpaceRef)
  */
-public static final native void CGContextSetFillColorSpace(long /*int*/ c, long /*int*/ colorspace);
+public static final native void CGContextSetFillColorSpace(long c, long colorspace);
 /**
  * @param c cast=(CGContextRef)
  * @param cap cast=(CGLineCap)
  */
-public static final native void CGContextSetLineCap(long /*int*/ c, int cap);
+public static final native void CGContextSetLineCap(long c, int cap);
 /**
  * @param c cast=(CGContextRef)
  * @param phase cast=(CGFloat)
  * @param lengths cast=(CGFloat*)
  * @param count cast=(size_t)
  */
-public static final native void CGContextSetLineDash(long /*int*/ c, double /*float*/ phase, float[] lengths, long /*int*/ count);
+public static final native void CGContextSetLineDash(long c, double phase, float[] lengths, long count);
 /**
  * @param c cast=(CGContextRef)
  * @param join cast=(CGLineJoin)
  */
-public static final native void CGContextSetLineJoin(long /*int*/ c, int join);
+public static final native void CGContextSetLineJoin(long c, int join);
 /**
  * @param c cast=(CGContextRef)
  * @param width cast=(CGFloat)
  */
-public static final native void CGContextSetLineWidth(long /*int*/ c, double /*float*/ width);
+public static final native void CGContextSetLineWidth(long c, double width);
 /**
  * @param c cast=(CGContextRef)
  * @param limit cast=(CGFloat)
  */
-public static final native void CGContextSetMiterLimit(long /*int*/ c, double /*float*/ limit);
+public static final native void CGContextSetMiterLimit(long c, double limit);
 /**
  * @param c cast=(CGContextRef)
  * @param shouldAntialias cast=(_Bool)
  */
-public static final native void CGContextSetShouldAntialias(long /*int*/ c, boolean shouldAntialias);
+public static final native void CGContextSetShouldAntialias(long c, boolean shouldAntialias);
 /**
  * @param c cast=(CGContextRef)
  * @param mode cast=(CGTextDrawingMode)
  */
-public static final native void CGContextSetTextDrawingMode(long /*int*/ c, int mode);
+public static final native void CGContextSetTextDrawingMode(long c, int mode);
 /**
  * @param c cast=(CGContextRef)
  * @param t flags=struct
  */
-public static final native void CGContextSetTextMatrix(long /*int*/ c, CGAffineTransform t);
+public static final native void CGContextSetTextMatrix(long c, CGAffineTransform t);
 /**
  * @param c cast=(CGContextRef)
  * @param x cast=(CGFloat)
  * @param y cast=(CGFloat)
  */
-public static final native void CGContextSetTextPosition(long /*int*/ c, double /*float*/ x, double /*float*/ y);
+public static final native void CGContextSetTextPosition(long c, double x, double y);
 /**
  * @param c cast=(CGContextRef)
  */
-public static final native void CGContextStrokePath(long /*int*/ c);
+public static final native void CGContextStrokePath(long c);
 /**
  * @param c cast=(CGContextRef)
  * @param tx cast=(CGFloat)
  * @param ty cast=(CGFloat)
  */
-public static final native void CGContextTranslateCTM(long /*int*/ c, double /*float*/ tx, double /*float*/ ty);
+public static final native void CGContextTranslateCTM(long c, double tx, double ty);
 /**
  * @param info cast=(void*)
  * @param data cast=(void*)
  * @param size cast=(size_t)
  * @param releaseData cast=(CGDataProviderReleaseDataCallback)
  */
-public static final native long /*int*/ CGDataProviderCreateWithData(long /*int*/ info, long /*int*/ data, long /*int*/ size, long /*int*/ releaseData);
+public static final native long CGDataProviderCreateWithData(long info, long data, long size, long releaseData);
 /**
  * @param provider cast=(CGDataProviderRef)
  */
-public static final native void CGDataProviderRelease(long /*int*/ provider);
+public static final native void CGDataProviderRelease(long provider);
 /**
  * @param display cast=(CGDirectDisplayID)
  */
-public static final native long /*int*/ CGDisplayPixelsHigh(int display);
+public static final native long CGDisplayPixelsHigh(int display);
 /**
  * @param display cast=(CGDirectDisplayID)
  */
-public static final native long /*int*/ CGDisplayPixelsWide(int display);
+public static final native long CGDisplayPixelsWide(int display);
 /**
  * @param source cast=(CGEventSourceRef)
  * @param virtualKey cast=(CGKeyCode)
  * @param keyDown cast=(_Bool)
  */
-public static final native long /*int*/ CGEventCreateKeyboardEvent(long /*int*/ source, short virtualKey, boolean keyDown);
+public static final native long CGEventCreateKeyboardEvent(long source, short virtualKey, boolean keyDown);
 /**
  * @param source cast=(CGEventSourceRef)
  * @param mouseType cast=(CGEventType)
  * @param mouseCursorPosition flags=struct
  * @param mouseButton cast=(CGMouseButton)
  */
-public static final native long /*int*/ CGEventCreateMouseEvent(long /*int*/ source, int mouseType, CGPoint mouseCursorPosition, int mouseButton);
+public static final native long CGEventCreateMouseEvent(long source, int mouseType, CGPoint mouseCursorPosition, int mouseButton);
 /**
  * @param source cast=(CGEventSourceRef)
  * @param units cast=(CGScrollEventUnit)
  * @param wheelCount cast=(CGWheelCount)
  * @param wheel1 cast=(int32_t)
  */
-public static final native long /*int*/ CGEventCreateScrollWheelEvent(long /*int*/ source, int units, int wheelCount, int wheel1);
+public static final native long CGEventCreateScrollWheelEvent(long source, int units, int wheelCount, int wheel1);
 /**
  * @param event cast=(CGEventRef)
  * @param field cast=(CGEventField)
  */
-public static final native long CGEventGetIntegerValueField(long /*int*/ event, int field);
+public static final native long CGEventGetIntegerValueField(long event, int field);
 /**
  * @param tap cast=(CGEventTapLocation)
  * @param event cast=(CGEventRef)
  */
-public static final native void CGEventPost(int tap, long /*int*/ event);
+public static final native void CGEventPost(int tap, long event);
 /**
  * @param sourceState cast=(CGEventSourceStateID)
  */
-public static final native long /*int*/ CGEventSourceCreate(int sourceState);
+public static final native long CGEventSourceCreate(int sourceState);
 /**
  * @param rect flags=struct
  * @param maxDisplays cast=(CGDisplayCount)
  * @param dspys cast=(CGDirectDisplayID*)
  * @param dspyCnt cast=(CGDisplayCount*)
  */
-public static final native int CGGetDisplaysWithRect(CGRect rect, int maxDisplays, long /*int*/ dspys, long /*int*/ dspyCnt);
+public static final native int CGGetDisplaysWithRect(CGRect rect, int maxDisplays, long dspys, long dspyCnt);
 /**
  * @param width cast=(size_t)
  * @param height cast=(size_t)
@@ -3653,19 +3653,19 @@ public static final native int CGGetDisplaysWithRect(CGRect rect, int maxDisplay
  * @param shouldInterpolate cast=(_Bool)
  * @param intent cast=(CGColorRenderingIntent)
  */
-public static final native long /*int*/ CGImageCreate(long /*int*/ width, long /*int*/ height, long /*int*/ bitsPerComponent, long /*int*/ bitsPerPixel, long /*int*/ bytesPerRow, long /*int*/ colorspace, int bitmapInfo, long /*int*/ provider, long /*int*/ decode, boolean shouldInterpolate, int intent);
+public static final native long CGImageCreate(long width, long height, long bitsPerComponent, long bitsPerPixel, long bytesPerRow, long colorspace, int bitmapInfo, long provider, long decode, boolean shouldInterpolate, int intent);
 /**
  * @param image cast=(CGImageRef)
  */
-public static final native long /*int*/ CGImageGetHeight(long /*int*/ image);
+public static final native long CGImageGetHeight(long image);
 /**
  * @param image cast=(CGImageRef)
  */
-public static final native long /*int*/ CGImageGetWidth(long /*int*/ image);
+public static final native long CGImageGetWidth(long image);
 /**
  * @param image cast=(CGImageRef)
  */
-public static final native void CGImageRelease(long /*int*/ image);
+public static final native void CGImageRelease(long image);
 /**
  * @param path cast=(CGMutablePathRef)
  * @param m cast=(CGAffineTransform*)
@@ -3676,46 +3676,46 @@ public static final native void CGImageRelease(long /*int*/ image);
  * @param x cast=(CGFloat)
  * @param y cast=(CGFloat)
  */
-public static final native void CGPathAddCurveToPoint(long /*int*/ path, long /*int*/ m, double /*float*/ cp1x, double /*float*/ cp1y, double /*float*/ cp2x, double /*float*/ cp2y, double /*float*/ x, double /*float*/ y);
+public static final native void CGPathAddCurveToPoint(long path, long m, double cp1x, double cp1y, double cp2x, double cp2y, double x, double y);
 /**
  * @param path cast=(CGMutablePathRef)
  * @param m cast=(CGAffineTransform*)
  * @param x cast=(CGFloat)
  * @param y cast=(CGFloat)
  */
-public static final native void CGPathAddLineToPoint(long /*int*/ path, long /*int*/ m, double /*float*/ x, double /*float*/ y);
+public static final native void CGPathAddLineToPoint(long path, long m, double x, double y);
 /**
  * @param path cast=(CGMutablePathRef)
  * @param m cast=(CGAffineTransform*)
  * @param rect flags=struct
  */
-public static final native void CGPathAddRect(long /*int*/ path, long /*int*/ m, CGRect rect);
+public static final native void CGPathAddRect(long path, long m, CGRect rect);
 /**
  * @param path cast=(CGPathRef)
  * @param info cast=(void*)
  * @param function cast=(CGPathApplierFunction)
  */
-public static final native void CGPathApply(long /*int*/ path, long /*int*/ info, long /*int*/ function);
+public static final native void CGPathApply(long path, long info, long function);
 /**
  * @param path cast=(CGMutablePathRef)
  */
-public static final native void CGPathCloseSubpath(long /*int*/ path);
+public static final native void CGPathCloseSubpath(long path);
 /**
  * @param path cast=(CGPathRef)
  */
-public static final native long /*int*/ CGPathCreateCopy(long /*int*/ path);
-public static final native long /*int*/ CGPathCreateMutable();
+public static final native long CGPathCreateCopy(long path);
+public static final native long CGPathCreateMutable();
 /**
  * @param path cast=(CGMutablePathRef)
  * @param m cast=(CGAffineTransform*)
  * @param x cast=(CGFloat)
  * @param y cast=(CGFloat)
  */
-public static final native void CGPathMoveToPoint(long /*int*/ path, long /*int*/ m, double /*float*/ x, double /*float*/ y);
+public static final native void CGPathMoveToPoint(long path, long m, double x, double y);
 /**
  * @param path cast=(CGPathRef)
  */
-public static final native void CGPathRelease(long /*int*/ path);
+public static final native void CGPathRelease(long path);
 /**
  * @param keyChar cast=(CGCharCode)
  * @param virtualKey cast=(CGKeyCode)
@@ -3738,51 +3738,51 @@ public static final native int CGWarpMouseCursorPosition(CGPoint newCursorPositi
 /**
  * @param font cast=(CTFontRef)
  */
-public static final native double /*float*/ CTFontGetAscent(long /*int*/ font);
+public static final native double CTFontGetAscent(long font);
 /**
  * @param font cast=(CTFontRef)
  */
-public static final native double /*float*/ CTFontGetDescent(long /*int*/ font);
+public static final native double CTFontGetDescent(long font);
 /**
  * @param font cast=(CTFontRef)
  */
-public static final native double /*float*/ CTFontGetLeading(long /*int*/ font);
+public static final native double CTFontGetLeading(long font);
 /**
  * @param attrString cast=(CFAttributedStringRef)
  */
-public static final native long /*int*/ CTLineCreateWithAttributedString(long /*int*/ attrString);
+public static final native long CTLineCreateWithAttributedString(long attrString);
 /**
  * @param line cast=(CTLineRef)
  * @param context cast=(CGContextRef)
  */
-public static final native void CTLineDraw(long /*int*/ line, long /*int*/ context);
+public static final native void CTLineDraw(long line, long context);
 /**
  * @param line cast=(CTLineRef)
  * @param ascent cast=(CGFloat*)
  * @param descent cast=(CGFloat*)
  * @param leading cast=(CGFloat*)
  */
-public static final native double CTLineGetTypographicBounds(long /*int*/ line, double[] /*float[]*/ ascent, double[] /*float[]*/ descent, double[] /*float[]*/ leading);
+public static final native double CTLineGetTypographicBounds(long line, double[] ascent, double[] descent, double[] leading);
 /**
  * @param settings cast=(CTParagraphStyleSetting*)
  * @param settingCount cast=(size_t)
  */
-public static final native long /*int*/ CTParagraphStyleCreate(long /*int*/ settings, long /*int*/ settingCount);
+public static final native long CTParagraphStyleCreate(long settings, long settingCount);
 /**
  * @param typesetter cast=(CTTypesetterRef)
  * @param stringRange flags=struct
  */
-public static final native long /*int*/ CTTypesetterCreateLine(long /*int*/ typesetter, CFRange stringRange);
+public static final native long CTTypesetterCreateLine(long typesetter, CFRange stringRange);
 /**
  * @param string cast=(CFAttributedStringRef)
  */
-public static final native long /*int*/ CTTypesetterCreateWithAttributedString(long /*int*/ string);
+public static final native long CTTypesetterCreateWithAttributedString(long string);
 /**
  * @param typesetter cast=(CTTypesetterRef)
  * @param startIndex cast=(CFIndex)
  * @param width cast=(double)
  */
-public static final native long /*int*/ CTTypesetterSuggestLineBreak(long /*int*/ typesetter, long /*int*/ startIndex, double width);
+public static final native long CTTypesetterSuggestLineBreak(long typesetter, long startIndex, double width);
 /**
  * @param aRect flags=struct
  * @param bRect flags=struct
@@ -3791,13 +3791,13 @@ public static final native boolean NSEqualRects(NSRect aRect, NSRect bRect);
 /**
  * @param hfsFileTypeCode cast=(OSType)
  */
-public static final native long /*int*/ NSFileTypeForHFSTypeCode(int hfsFileTypeCode);
+public static final native long NSFileTypeForHFSTypeCode(int hfsFileTypeCode);
 /**
  * @param typePtr cast=(char*)
  * @param sizep cast=(NSUInteger*)
  * @param alignp cast=(NSUInteger*)
  */
-public static final native long /*int*/ NSGetSizeAndAlignment(long /*int*/ typePtr, long[] /*int[]*/ sizep, long[] /*int[]*/ alignp);
+public static final native long NSGetSizeAndAlignment(long typePtr, long[] sizep, long[] alignp);
 /**
  * @param aPoint flags=struct
  * @param aRect flags=struct
@@ -3808,8 +3808,8 @@ public static final native boolean NSPointInRect(NSPoint aPoint, NSRect aRect);
  * @param domainMask cast=(NSSearchPathDomainMask)
  * @param expandTilde cast=(BOOL)
  */
-public static final native long /*int*/ NSSearchPathForDirectoriesInDomains(long /*int*/ directory, long /*int*/ domainMask, boolean expandTilde);
-public static final native long /*int*/ NSTemporaryDirectory();
+public static final native long NSSearchPathForDirectoriesInDomains(long directory, long domainMask, boolean expandTilde);
+public static final native long NSTemporaryDirectory();
 
 /** Super Sends */
 
@@ -3817,519 +3817,517 @@ public static final native long /*int*/ NSTemporaryDirectory();
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native boolean objc_msgSendSuper_bool(objc_super superId, long /*int*/ sel, NSRange arg0, long /*int*/ arg1);
+public static final native boolean objc_msgSendSuper_bool(objc_super superId, long sel, NSRange arg0, long arg1);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native boolean objc_msgSendSuper_bool(objc_super superId, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1);
+public static final native boolean objc_msgSendSuper_bool(objc_super superId, long sel, long arg0, NSPoint arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel);
+public static final native long objc_msgSendSuper(objc_super superId, long sel);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, NSPoint arg0);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, NSPoint arg0);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, NSRect arg0);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, NSRect arg0);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, NSRect arg0, long /*int*/ arg1);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, NSRect arg0, long arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, NSSize arg0);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, NSSize arg0);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, boolean arg0);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, boolean arg0);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, boolean arg0, NSRect arg1);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, boolean arg0, NSRect arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, long arg0);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, long arg0, NSPoint arg1);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, long arg0, NSPoint arg1, long arg2);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, NSRect arg1, long /*int*/ arg2);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, long arg0, NSRect arg1, long arg2);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, boolean arg1);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, long arg0, boolean arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, long arg0, long arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, boolean arg3);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, long arg0, long arg1, long arg2, boolean arg3);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSendSuper(objc_super superId, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3);
+public static final native long objc_msgSendSuper(objc_super superId, long sel, long arg0, long arg1, long arg2, long arg3);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, long /*int*/ sel, NSRect arg0);
+public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, long sel, NSRect arg0);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, long /*int*/ sel, NSRect arg0, long /*int*/ arg1);
+public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, long sel, NSRect arg0, long arg1);
 /** @method flags=cast */
-public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, long /*int*/ sel, long /*int*/ arg0);
+public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, long sel, long arg0);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, long /*int*/ sel, long /*int*/ arg0, NSRect arg1, long /*int*/ arg2);
+public static final native void objc_msgSendSuper_stret(NSRect result, objc_super superId, long sel, long arg0, NSRect arg1, long arg2);
 /** @method flags=cast */
-public static final native void objc_msgSendSuper_stret(NSSize result, objc_super superId, long /*int*/ sel);
+public static final native void objc_msgSendSuper_stret(NSSize result, objc_super superId, long sel);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSendSuper_stret(NSSize result, objc_super superId, long /*int*/ sel, NSRect arg0);
+public static final native void objc_msgSendSuper_stret(NSSize result, objc_super superId, long sel, NSRect arg0);
 /** @method flags=cast */
-public static final native void objc_msgSendSuper_stret(NSSize result, objc_super superId, long /*int*/ sel, boolean arg0);
+public static final native void objc_msgSendSuper_stret(NSSize result, objc_super superId, long sel, boolean arg0);
 
 /** Sends */
 
 /** @method flags=cast */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel);
+public static final native boolean objc_msgSend_bool(long id, long sel);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, NSPoint arg0);
+public static final native boolean objc_msgSend_bool(long id, long sel, NSPoint arg0);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  * @param arg1 flags=struct
  */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, NSPoint arg0, NSRect arg1);
+public static final native boolean objc_msgSend_bool(long id, long sel, NSPoint arg0, NSRect arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, NSRange arg0, long /*int*/ arg1);
+public static final native boolean objc_msgSend_bool(long id, long sel, NSRange arg0, long arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, NSRect arg0);
+public static final native boolean objc_msgSend_bool(long id, long sel, NSRect arg0);
 /** @method flags=cast */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0);
+public static final native boolean objc_msgSend_bool(long id, long sel, long arg0);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1);
+public static final native boolean objc_msgSend_bool(long id, long sel, long arg0, NSPoint arg1);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSSize arg1, boolean arg2);
+public static final native boolean objc_msgSend_bool(long id, long sel, long arg0, NSSize arg1, boolean arg2);
 /** @method flags=cast */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1);
+public static final native boolean objc_msgSend_bool(long id, long sel, long arg0, long arg1);
 /** @method flags=cast */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2);
+public static final native boolean objc_msgSend_bool(long id, long sel, long arg0, long arg1, long arg2);
 /** @method flags=cast */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3);
+public static final native boolean objc_msgSend_bool(long id, long sel, long arg0, long arg1, long arg2, long arg3);
 /** @method flags=cast */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4);
+public static final native boolean objc_msgSend_bool(long id, long sel, long arg0, long arg1, long arg2, long arg3, long arg4);
 /** @method flags=cast */
-public static final native boolean objc_msgSend_bool(long /*int*/ id, long /*int*/ sel, short arg0);
+public static final native boolean objc_msgSend_bool(long id, long sel, short arg0);
 /** @method flags=cast */
-public static final native double objc_msgSend_fpret(long /*int*/ id, long /*int*/ sel);
+public static final native double objc_msgSend_fpret(long id, long sel);
 /** @method flags=cast */
-public static final native double objc_msgSend_fpret(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0);
+public static final native double objc_msgSend_fpret(long id, long sel, long arg0);
 /** @method flags=cast */
-public static final native double objc_msgSend_fpret(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1);
+public static final native double objc_msgSend_fpret(long id, long sel, long arg0, long arg1);
 /** @method flags=cast */
-public static final native float objc_msgSend_floatret(long /*int*/ id, long /*int*/ sel);
+public static final native float objc_msgSend_floatret(long id, long sel);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel);
+public static final native long objc_msgSend(long id, long sel);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSAffineTransformStruct arg0);
+public static final native long objc_msgSend(long id, long sel, NSAffineTransformStruct arg0);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0);
+public static final native long objc_msgSend(long id, long sel, NSPoint arg0);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  * @param arg1 flags=struct
  * @param arg2 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, NSPoint arg1, NSPoint arg2);
+public static final native long objc_msgSend(long id, long sel, NSPoint arg0, NSPoint arg1, NSPoint arg2);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, NSPoint arg1, long /*int*/ arg2);
+public static final native long objc_msgSend(long id, long sel, NSPoint arg0, NSPoint arg1, long arg2);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, NSRect arg1, long /*int*/ arg2, double /*float*/ arg3);
+public static final native long objc_msgSend(long id, long sel, NSPoint arg0, NSRect arg1, long arg2, double arg3);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, double /*float*/ arg1, double /*float*/ arg2, double /*float*/ arg3);
+public static final native long objc_msgSend(long id, long sel, NSPoint arg0, double arg1, double arg2, double arg3);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, double /*float*/ arg1, double /*float*/ arg2, double /*float*/ arg3, boolean arg4);
+public static final native long objc_msgSend(long id, long sel, NSPoint arg0, double arg1, double arg2, double arg3, boolean arg4);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, long /*int*/ arg1);
+public static final native long objc_msgSend(long id, long sel, NSPoint arg0, long arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSPoint arg0, long /*int*/ arg1, double[] /*float[]*/ arg2);
+public static final native long objc_msgSend(long id, long sel, NSPoint arg0, long arg1, double[] arg2);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRange arg0);
+public static final native long objc_msgSend(long id, long sel, NSRange arg0);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRange arg0, NSPoint arg1);
+public static final native long objc_msgSend(long id, long sel, NSRange arg0, NSPoint arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRange arg0, NSRange arg1, long /*int*/ arg2, long[] /*int[]*/ arg3);
+public static final native long objc_msgSend(long id, long sel, NSRange arg0, NSRange arg1, long arg2, long[] arg3);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRange arg0, long /*int*/ arg1);
+public static final native long objc_msgSend(long id, long sel, NSRange arg0, long arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRange arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, byte[] arg5);
+public static final native long objc_msgSend(long id, long sel, NSRange arg0, long arg1, long arg2, long arg3, long arg4, byte[] arg5);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, NSPoint arg1);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, NSPoint arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  * @param arg1 flags=struct
  * @param arg2 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, NSRange arg1, NSRect arg2);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, NSRange arg1, NSRect arg2);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, NSRect arg1, long /*int*/ arg2, double /*float*/ arg3);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, NSRect arg1, long arg2, double arg3);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, NSSize arg1);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, NSSize arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, boolean arg1);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, boolean arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, boolean arg1, boolean arg2);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, boolean arg1, boolean arg2);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, double /*float*/ arg1);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, double arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, double /*float*/ arg1, double /*float*/ arg2);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, double arg1, double arg2);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, long arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1, boolean arg2, long /*int*/ arg3);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, long arg1, boolean arg2, long arg3);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1, long /*int*/ arg2);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, long arg1, long arg2);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1, long /*int*/ arg2, boolean arg3);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, long arg1, long arg2, boolean arg3);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1, long /*int*/ arg2, boolean arg3, long /*int*/ arg4);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, long arg1, long arg2, boolean arg3, long arg4);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3);
+public static final native long objc_msgSend(long id, long sel, NSRect arg0, long arg1, long arg2, long arg3);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, NSSize arg0);
+public static final native long objc_msgSend(long id, long sel, NSSize arg0);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, boolean arg0);
+public static final native long objc_msgSend(long id, long sel, boolean arg0);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, boolean arg0, NSRect arg1);
+public static final native long objc_msgSend(long id, long sel, boolean arg0, NSRect arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, boolean arg0, long /*int*/ arg1);
+public static final native long objc_msgSend(long id, long sel, boolean arg0, long arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, byte[] arg0);
+public static final native long objc_msgSend(long id, long sel, byte[] arg0);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, byte[] arg0, long /*int*/ arg1);
+public static final native long objc_msgSend(long id, long sel, byte[] arg0, long arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, char[] arg0);
+public static final native long objc_msgSend(long id, long sel, char[] arg0);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, char[] arg0, NSRange arg1);
+public static final native long objc_msgSend(long id, long sel, char[] arg0, NSRange arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, char[] arg0, long /*int*/ arg1);
+public static final native long objc_msgSend(long id, long sel, char[] arg0, long arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double arg0);
+public static final native long objc_msgSend(long id, long sel, double arg0);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, boolean arg4);
+public static final native long objc_msgSend(long id, long sel, double arg0, double arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double /*float*/ arg0, double /*float*/ arg1);
+public static final native long objc_msgSend(long id, long sel, double arg0, double arg1, double arg2, double arg3);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double /*float*/ arg0, double /*float*/ arg1, double /*float*/ arg2, double /*float*/ arg3);
+public static final native long objc_msgSend(long id, long sel, double arg0, long arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double /*float*/ arg0, long /*int*/ arg1);
+public static final native long objc_msgSend(long id, long sel, double arg0, long arg1, long arg2, long arg3, boolean arg4);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double[] /*float[]*/ arg0);
+public static final native long objc_msgSend(long id, long sel, double[] arg0);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, double[] /*float[]*/ arg0, long /*int*/ arg1, double /*float*/ arg2);
+public static final native long objc_msgSend(long id, long sel, double[] arg0, long arg1, double arg2);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0);
+public static final native long objc_msgSend(long id, long sel, int arg0);
+/** @method flags=cast */
+public static final native long objc_msgSend(long id, long sel, int[] arg0);
+/** @method flags=cast */
+public static final native long objc_msgSend(long id, long sel, int[] arg0, long arg1);
+/** @method flags=cast */
+public static final native long objc_msgSend(long id, long sel, long arg0);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1);
+public static final native long objc_msgSend(long id, long sel, long arg0, NSPoint arg1);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  * @param arg2 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, NSSize arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, boolean arg6);
+public static final native long objc_msgSend(long id, long sel, long arg0, NSPoint arg1, NSSize arg2, long arg3, long arg4, long arg5, boolean arg6);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2);
+public static final native long objc_msgSend(long id, long sel, long arg0, NSPoint arg1, long arg2);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2, double arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6, long /*int*/ arg7, long /*int*/ arg8);
+public static final native long objc_msgSend(long id, long sel, long arg0, NSPoint arg1, long arg2, double arg3, long arg4, long arg5, long arg6, long arg7, long arg8);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSPoint arg1, long /*int*/ arg2, double arg3, long /*int*/ arg4, long /*int*/ arg5, short arg6, long /*int*/ arg7, long /*int*/ arg8);
+public static final native long objc_msgSend(long id, long sel, long arg0, NSPoint arg1, long arg2, double arg3, long arg4, long arg5, short arg6, long arg7, long arg8);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSRange arg1);
+public static final native long objc_msgSend(long id, long sel, long arg0, NSRange arg1);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSRect arg1, long /*int*/ arg2);
+public static final native long objc_msgSend(long id, long sel, long arg0, NSRect arg1, long arg2);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, boolean arg1);
+public static final native long objc_msgSend(long id, long sel, long arg0, boolean arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, double /*float*/ arg1);
+public static final native long objc_msgSend(long id, long sel, long arg0, double arg1);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1);
 /**
  * @method flags=cast
  * @param arg2 flags=struct
  */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, NSRange arg2);
-/** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, boolean arg2);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, NSRange arg2);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, double arg2, long /*int*/ arg3);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, boolean arg2);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, double arg2, long arg3);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, boolean arg3);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, long arg2);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, double /*float*/ arg3);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, long arg2, boolean arg3);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, long arg2, double arg3);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, long arg2, long arg3);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, boolean arg5, boolean arg6, long /*int*/ arg7, long /*int*/ arg8, long /*int*/ arg9);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, long arg2, long arg3, long arg4);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, boolean arg5, boolean arg6, long /*int*/ arg7, long /*int*/ arg8, long /*int*/ arg9, long /*int*/ arg10);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, long arg2, long arg3, long arg4, boolean arg5, boolean arg6, long arg7, long arg8, long arg9);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, long arg2, long arg3, long arg4, boolean arg5, boolean arg6, long arg7, long arg8, long arg9, long arg10);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4, long /*int*/ arg5, long /*int*/ arg6);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long[] /*int[]*/ arg0);
+public static final native long objc_msgSend(long id, long sel, long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long[] /*int[]*/ arg0, int arg1, int arg2);
+public static final native long objc_msgSend(long id, long sel, long[] arg0);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, int[] arg0, long /*int*/ arg1);
-/** @method flags=cast */
-public static final native int objc_msgSend(int id, int sel, float arg0);
-/** @method flags=cast */
-public static final native long objc_msgSend(long id, long sel, int arg0);
-/** @method flags=cast */
-public static final native long objc_msgSend(long id, long sel, int[] arg0);
+public static final native long objc_msgSend(long id, long sel, long[] arg0, int arg1, int arg2);
 /** @method flags=cast */
 public static final native long objc_msgSend(long id, long sel, long[] arg0, long arg1, long arg2);
 /** @method flags=cast */
-public static final native void objc_msgSend_stret(NSAffineTransformStruct result, long /*int*/ id, long /*int*/ sel);
+public static final native void objc_msgSend_stret(NSAffineTransformStruct result, long id, long sel);
 /** @method flags=cast */
-public static final native void objc_msgSend_stret(NSPoint result, long /*int*/ id, long /*int*/ sel);
+public static final native void objc_msgSend_stret(NSPoint result, long id, long sel);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSPoint result, long /*int*/ id, long /*int*/ sel, NSPoint arg0);
+public static final native void objc_msgSend_stret(NSPoint result, long id, long sel, NSPoint arg0);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSPoint result, long /*int*/ id, long /*int*/ sel, NSPoint arg0, long /*int*/ arg1);
+public static final native void objc_msgSend_stret(NSPoint result, long id, long sel, NSPoint arg0, long arg1);
 /** @method flags=cast */
-public static final native void objc_msgSend_stret(NSPoint result, long /*int*/ id, long /*int*/ sel, long /*int*/ arg0);
+public static final native void objc_msgSend_stret(NSPoint result, long id, long sel, long arg0);
 /** @method flags=cast */
-public static final native void objc_msgSend_stret(NSRange result, long /*int*/ id, long /*int*/ sel);
+public static final native void objc_msgSend_stret(NSRange result, long id, long sel);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSRange result, long /*int*/ id, long /*int*/ sel, NSRange arg0, long /*int*/ arg1);
+public static final native void objc_msgSend_stret(NSRange result, long id, long sel, NSRange arg0, long arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSRange result, long /*int*/ id, long /*int*/ sel, NSRect arg0);
+public static final native void objc_msgSend_stret(NSRange result, long id, long sel, NSRect arg0);
 /** @method flags=cast */
-public static final native void objc_msgSend_stret(NSRange result, long /*int*/ id, long /*int*/ sel, long /*int*/ arg0);
+public static final native void objc_msgSend_stret(NSRange result, long id, long sel, long arg0);
 /** @method flags=cast */
-public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel);
+public static final native void objc_msgSend_stret(NSRect result, long id, long sel);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, NSRange arg0, long /*int*/ arg1);
+public static final native void objc_msgSend_stret(NSRect result, long id, long sel, NSRange arg0, long arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, NSRect arg0);
+public static final native void objc_msgSend_stret(NSRect result, long id, long sel, NSRect arg0);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1);
+public static final native void objc_msgSend_stret(NSRect result, long id, long sel, NSRect arg0, long arg1);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, NSSize arg0, long /*int*/ arg1);
+public static final native void objc_msgSend_stret(NSRect result, long id, long sel, NSSize arg0, long arg1);
 /** @method flags=cast */
-public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, long /*int*/ arg0);
+public static final native void objc_msgSend_stret(NSRect result, long id, long sel, long arg0);
 /**
  * @method flags=cast
  * @param arg1 flags=struct
  */
-public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSRect arg1, long /*int*/ arg2);
+public static final native void objc_msgSend_stret(NSRect result, long id, long sel, long arg0, NSRect arg1, long arg2);
 /** @method flags=cast */
-public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1);
+public static final native void objc_msgSend_stret(NSRect result, long id, long sel, long arg0, long arg1);
 /** @method flags=cast */
-public static final native void objc_msgSend_stret(NSRect result, long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, boolean arg2);
+public static final native void objc_msgSend_stret(NSRect result, long id, long sel, long arg0, long arg1, boolean arg2);
 /** @method flags=cast */
-public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel);
+public static final native void objc_msgSend_stret(NSSize result, long id, long sel);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel, NSRect arg0);
+public static final native void objc_msgSend_stret(NSSize result, long id, long sel, NSRect arg0);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel, NSSize arg0);
+public static final native void objc_msgSend_stret(NSSize result, long id, long sel, NSSize arg0);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel, NSSize arg0, boolean arg1, boolean arg2, long /*int*/ arg3);
+public static final native void objc_msgSend_stret(NSSize result, long id, long sel, NSSize arg0, boolean arg1, boolean arg2, long arg3);
 /**
  * @method flags=cast
  * @param arg0 flags=struct
  */
-public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel, NSSize arg0, long /*int*/ arg1);
+public static final native void objc_msgSend_stret(NSSize result, long id, long sel, NSSize arg0, long arg1);
 /** @method flags=cast */
-public static final native void objc_msgSend_stret(NSSize result, long /*int*/ id, long /*int*/ sel, boolean arg0);
+public static final native void objc_msgSend_stret(NSSize result, long id, long sel, boolean arg0);
 
 /** Sizeof natives */
 public static final native int CFRange_sizeof();
@@ -4351,52 +4349,52 @@ public static final native int NSSize_sizeof();
  * @param dest cast=(void *),flags=no_in critical
  * @param src cast=(void *),flags=critical
  */
-public static final native void memmove(long /*int*/ dest, CGPathElement src, long /*int*/ size);
+public static final native void memmove(long dest, CGPathElement src, long size);
 /**
  * @param dest cast=(void *),flags=no_in critical
  * @param src cast=(void *),flags=critical
  */
-public static final native void memmove(CGPathElement dest, long /*int*/ src, long /*int*/ size);
+public static final native void memmove(CGPathElement dest, long src, long size);
 /**
  * @param dest cast=(void *),flags=no_in critical
  * @param src cast=(void *),flags=critical
  */
-public static final native void memmove(long /*int*/ dest, NSPoint src, long /*int*/ size);
+public static final native void memmove(long dest, NSPoint src, long size);
 /**
  * @param dest cast=(void *),flags=no_in critical
  * @param src cast=(void *),flags=critical
  */
-public static final native void memmove(NSPoint dest, long /*int*/ src, long /*int*/ size);
+public static final native void memmove(NSPoint dest, long src, long size);
 /**
  * @param dest cast=(void *),flags=no_in critical
  * @param src cast=(void *),flags=critical
  */
-public static final native void memmove(long /*int*/ dest, NSRange src, long /*int*/ size);
+public static final native void memmove(long dest, NSRange src, long size);
 /**
  * @param dest cast=(void *),flags=no_in critical
  * @param src cast=(void *),flags=critical
  */
-public static final native void memmove(NSRange dest, long /*int*/ src, long /*int*/ size);
+public static final native void memmove(NSRange dest, long src, long size);
 /**
  * @param dest cast=(void *),flags=no_in critical
  * @param src cast=(void *),flags=critical
  */
-public static final native void memmove(long /*int*/ dest, NSRect src, long /*int*/ size);
+public static final native void memmove(long dest, NSRect src, long size);
 /**
  * @param dest cast=(void *),flags=no_in critical
  * @param src cast=(void *),flags=critical
  */
-public static final native void memmove(NSRect dest, long /*int*/ src, long /*int*/ size);
+public static final native void memmove(NSRect dest, long src, long size);
 /**
  * @param dest cast=(void *),flags=no_in critical
  * @param src cast=(void *),flags=critical
  */
-public static final native void memmove(long /*int*/ dest, NSSize src, long /*int*/ size);
+public static final native void memmove(long dest, NSSize src, long size);
 /**
  * @param dest cast=(void *),flags=no_in critical
  * @param src cast=(void *),flags=critical
  */
-public static final native void memmove(NSSize dest, long /*int*/ src, long /*int*/ size);
+public static final native void memmove(NSSize dest, long src, long size);
 
 /** This section is auto generated */
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Protocol.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Protocol.java
index 2cd3d308f2..f8c74d5937 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Protocol.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/Protocol.java
@@ -19,7 +19,7 @@ public Protocol() {
 	super();
 }
 
-public Protocol(long /*int*/ id) {
+public Protocol(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificatePanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificatePanel.java
index a16fdb4366..02d8196e5a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificatePanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificatePanel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public SFCertificatePanel() {
 	super();
 }
 
-public SFCertificatePanel(long /*int*/ id) {
+public SFCertificatePanel(long id) {
 	super(id);
 }
 
@@ -35,11 +35,11 @@ public void setShowsHelp(boolean showsHelp) {
 	OS.objc_msgSend(this.id, OS.sel_setShowsHelp_, showsHelp);
 }
 
-public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_SFCertificatePanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double minFrameWidthWithTitle(NSString aTitle, long aStyle) {
+	return OS.objc_msgSend_fpret(OS.class_SFCertificatePanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
-public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
+public static long windowNumberAtPoint(NSPoint point, long windowNumber) {
 	return OS.objc_msgSend(OS.class_SFCertificatePanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificateTrustPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificateTrustPanel.java
index c07a411587..a15123822e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificateTrustPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SFCertificateTrustPanel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -19,7 +19,7 @@ public SFCertificateTrustPanel() {
 	super();
 }
 
-public SFCertificateTrustPanel(long /*int*/ id) {
+public SFCertificateTrustPanel(long id) {
 	super(id);
 }
 
@@ -27,20 +27,20 @@ public SFCertificateTrustPanel(id id) {
 	super(id);
 }
 
-public void beginSheetForWindow(NSWindow docWindow, id delegate, long /*int*/ didEndSelector, long /*int*/ contextInfo, long /*int*/ trust, NSString message) {
+public void beginSheetForWindow(NSWindow docWindow, id delegate, long didEndSelector, long contextInfo, long trust, NSString message) {
 	OS.objc_msgSend(this.id, OS.sel_beginSheetForWindow_modalDelegate_didEndSelector_contextInfo_trust_message_, docWindow != null ? docWindow.id : 0, delegate != null ? delegate.id : 0, didEndSelector, contextInfo, trust, message != null ? message.id : 0);
 }
 
 public static SFCertificateTrustPanel sharedCertificateTrustPanel() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_SFCertificateTrustPanel, OS.sel_sharedCertificateTrustPanel);
+	long result = OS.objc_msgSend(OS.class_SFCertificateTrustPanel, OS.sel_sharedCertificateTrustPanel);
 	return result != 0 ? new SFCertificateTrustPanel(result) : null;
 }
 
-public static double /*float*/ minFrameWidthWithTitle(NSString aTitle, long /*int*/ aStyle) {
-	return (double /*float*/)OS.objc_msgSend_fpret(OS.class_SFCertificateTrustPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
+public static double minFrameWidthWithTitle(NSString aTitle, long aStyle) {
+	return OS.objc_msgSend_fpret(OS.class_SFCertificateTrustPanel, OS.sel_minFrameWidthWithTitle_styleMask_, aTitle != null ? aTitle.id : 0, aStyle);
 }
 
-public static long /*int*/ windowNumberAtPoint(NSPoint point, long /*int*/ windowNumber) {
+public static long windowNumberAtPoint(NSPoint point, long windowNumber) {
 	return OS.objc_msgSend(OS.class_SFCertificateTrustPanel, OS.sel_windowNumberAtPoint_belowWindowWithWindowNumber_, point, windowNumber);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTApplicationDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTApplicationDelegate.java
index 4e0f0bf7bc..e98394f7fd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTApplicationDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTApplicationDelegate.java
@@ -18,7 +18,7 @@ public class SWTApplicationDelegate extends NSObject {
 		super(0);
 	}
 
-	public SWTApplicationDelegate(long /*int*/ id) {
+	public SWTApplicationDelegate(long id) {
 		super(id);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTCanvasView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTCanvasView.java
index 0c8e66b816..8c902bfe98 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTCanvasView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTCanvasView.java
@@ -20,7 +20,7 @@ public SWTCanvasView() {
 	super(0);
 }
 
-public SWTCanvasView(long /*int*/ id) {
+public SWTCanvasView(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTDragSourceDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTDragSourceDelegate.java
index cde0d8552e..9c693d0462 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTDragSourceDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTDragSourceDelegate.java
@@ -19,7 +19,7 @@ public class SWTDragSourceDelegate extends NSObject {
 		super(0);
 	}
 
-	public SWTDragSourceDelegate(long /*int*/ id) {
+	public SWTDragSourceDelegate(long id) {
 		super(id);
 	}
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTPanelDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTPanelDelegate.java
index 768794ee52..5a03338ab2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTPanelDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTPanelDelegate.java
@@ -19,7 +19,7 @@ public SWTPanelDelegate() {
 	super(0);
 }
 
-public SWTPanelDelegate(long /*int*/ id) {
+public SWTPanelDelegate(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTPrintPanelDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTPrintPanelDelegate.java
index d3d9c4bc24..5868b7aa62 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTPrintPanelDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTPrintPanelDelegate.java
@@ -19,7 +19,7 @@ public SWTPrintPanelDelegate() {
 	super(0);
 }
 
-public SWTPrintPanelDelegate(long /*int*/ id) {
+public SWTPrintPanelDelegate(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTScrollView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTScrollView.java
index 3b649c0733..59c6cc5a34 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTScrollView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTScrollView.java
@@ -19,7 +19,7 @@ public SWTScrollView() {
 	super(0);
 }
 
-public SWTScrollView(long /*int*/ id) {
+public SWTScrollView(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTTabView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTTabView.java
index a80a14b3fe..680e48c907 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTTabView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTTabView.java
@@ -19,7 +19,7 @@ public SWTTabView() {
 	super(0);
 }
 
-public SWTTabView(long /*int*/ id) {
+public SWTTabView(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTTextView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTTextView.java
index 9197e293b7..54c267683f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTTextView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTTextView.java
@@ -19,7 +19,7 @@ public SWTTextView() {
 	super(0);
 }
 
-public SWTTextView(long /*int*/ id) {
+public SWTTextView(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTView.java
index 82550cfa1e..edc9602a16 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTView.java
@@ -20,7 +20,7 @@ public SWTView() {
 	super(0);
 }
 
-public SWTView(long /*int*/ id) {
+public SWTView(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTWindowDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTWindowDelegate.java
index bf76b03fff..a40b98c11d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTWindowDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/SWTWindowDelegate.java
@@ -19,7 +19,7 @@ public SWTWindowDelegate() {
 	super(0);
 }
 
-public SWTWindowDelegate(long /*int*/ id) {
+public SWTWindowDelegate(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDataSource.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDataSource.java
index 9ac5130a53..2a885dc6d5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDataSource.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDataSource.java
@@ -19,7 +19,7 @@ public WebDataSource() {
 	super();
 }
 
-public WebDataSource(long /*int*/ id) {
+public WebDataSource(long id) {
 	super(id);
 }
 
@@ -28,22 +28,22 @@ public WebDataSource(id id) {
 }
 
 public NSString pageTitle() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_pageTitle);
+	long result = OS.objc_msgSend(this.id, OS.sel_pageTitle);
 	return result != 0 ? new NSString(result) : null;
 }
 
 public WebDocumentRepresentation representation() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_representation);
+	long result = OS.objc_msgSend(this.id, OS.sel_representation);
 	return result != 0 ? new WebDocumentRepresentation(result) : null;
 }
 
 public NSMutableURLRequest request() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_request);
+	long result = OS.objc_msgSend(this.id, OS.sel_request);
 	return result != 0 ? new NSMutableURLRequest(result) : null;
 }
 
 public WebFrame webFrame() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_webFrame);
+	long result = OS.objc_msgSend(this.id, OS.sel_webFrame);
 	return result != 0 ? new WebFrame(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDocumentRepresentation.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDocumentRepresentation.java
index f9322e3647..175da9b88d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDocumentRepresentation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebDocumentRepresentation.java
@@ -19,7 +19,7 @@ public WebDocumentRepresentation() {
 	super();
 }
 
-public WebDocumentRepresentation(long /*int*/ id) {
+public WebDocumentRepresentation(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public WebDocumentRepresentation(id id) {
 }
 
 public NSString documentSource() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_documentSource);
+	long result = OS.objc_msgSend(this.id, OS.sel_documentSource);
 	return result != 0 ? new NSString(result) : null;
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrame.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrame.java
index f046a69b8e..ea76ac5459 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrame.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrame.java
@@ -19,7 +19,7 @@ public WebFrame() {
 	super();
 }
 
-public WebFrame(long /*int*/ id) {
+public WebFrame(long id) {
 	super(id);
 }
 
@@ -28,16 +28,16 @@ public WebFrame(id id) {
 }
 
 public DOMDocument DOMDocument() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_DOMDocument);
+	long result = OS.objc_msgSend(this.id, OS.sel_DOMDocument);
 	return result != 0 ? new DOMDocument(result) : null;
 }
 
 public WebDataSource dataSource() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_dataSource);
+	long result = OS.objc_msgSend(this.id, OS.sel_dataSource);
 	return result != 0 ? new WebDataSource(result) : null;
 }
 
-public long /*int*/ globalContext() {
+public long globalContext() {
 	return OS.objc_msgSend(this.id, OS.sel_globalContext);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrameView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrameView.java
index 76fb7488cc..1521930360 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrameView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebFrameView.java
@@ -19,7 +19,7 @@ public WebFrameView() {
 	super();
 }
 
-public WebFrameView(long /*int*/ id) {
+public WebFrameView(long id) {
 	super(id);
 }
 
@@ -36,7 +36,7 @@ public void printDocumentView() {
 }
 
 public NSPrintOperation printOperationWithPrintInfo(NSPrintInfo printInfo) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_printOperationWithPrintInfo_, printInfo != null ? printInfo.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_printOperationWithPrintInfo_, printInfo != null ? printInfo.id : 0);
 	return result != 0 ? new NSPrintOperation(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebOpenPanelResultListener.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebOpenPanelResultListener.java
index 075b4d5d59..d3bb0a502f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebOpenPanelResultListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebOpenPanelResultListener.java
@@ -19,7 +19,7 @@ public WebOpenPanelResultListener() {
 	super();
 }
 
-public WebOpenPanelResultListener(long /*int*/ id) {
+public WebOpenPanelResultListener(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPolicyDecisionListener.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPolicyDecisionListener.java
index 91c286f36a..21cfe41b0c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPolicyDecisionListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPolicyDecisionListener.java
@@ -19,7 +19,7 @@ public WebPolicyDecisionListener() {
 	super();
 }
 
-public WebPolicyDecisionListener(long /*int*/ id) {
+public WebPolicyDecisionListener(long id) {
 	super(id);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java
index 4668726e33..ff6d7739cd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java
@@ -19,7 +19,7 @@ public WebPreferences() {
 	super();
 }
 
-public WebPreferences(long /*int*/ id) {
+public WebPreferences(long id) {
 	super(id);
 }
 
@@ -36,7 +36,7 @@ public void setJavaScriptEnabled(boolean javaScriptEnabled) {
 }
 
 public static WebPreferences standardPreferences() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_WebPreferences, OS.sel_standardPreferences);
+	long result = OS.objc_msgSend(OS.class_WebPreferences, OS.sel_standardPreferences);
 	return result != 0 ? new WebPreferences(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebScriptObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebScriptObject.java
index 069d3c4695..99382908fa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebScriptObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebScriptObject.java
@@ -19,7 +19,7 @@ public WebScriptObject() {
 	super();
 }
 
-public WebScriptObject(long /*int*/ id) {
+public WebScriptObject(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public WebScriptObject(id id) {
 }
 
 public id webScriptValueAtIndex(int index) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_webScriptValueAtIndex_, index);
+	long result = OS.objc_msgSend(this.id, OS.sel_webScriptValueAtIndex_, index);
 	return result != 0 ? new id(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebUndefined.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebUndefined.java
index 5dc27de4bb..65da9bcb30 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebUndefined.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebUndefined.java
@@ -19,7 +19,7 @@ public WebUndefined() {
 	super();
 }
 
-public WebUndefined(long /*int*/ id) {
+public WebUndefined(long id) {
 	super(id);
 }
 
@@ -28,7 +28,7 @@ public WebUndefined(id id) {
 }
 
 public static WebUndefined undefined() {
-	long /*int*/ result = OS.objc_msgSend(OS.class_WebUndefined, OS.sel_undefined);
+	long result = OS.objc_msgSend(OS.class_WebUndefined, OS.sel_undefined);
 	return result != 0 ? new WebUndefined(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java
index 32ecf18a10..2b1361f741 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java
@@ -19,7 +19,7 @@ public WebView() {
 	super();
 }
 
-public WebView(long /*int*/ id) {
+public WebView(long id) {
 	super(id);
 }
 
@@ -56,12 +56,12 @@ public boolean goForward() {
 }
 
 public WebView initWithFrame(NSRect frame, NSString frameName, NSString groupName) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_frameName_groupName_, frame, frameName != null ? frameName.id : 0, groupName != null ? groupName.id : 0);
+	long result = OS.objc_msgSend(this.id, OS.sel_initWithFrame_frameName_groupName_, frame, frameName != null ? frameName.id : 0, groupName != null ? groupName.id : 0);
 	return result == this.id ? this : (result != 0 ? new WebView(result) : null);
 }
 
 public WebFrame mainFrame() {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_mainFrame);
+	long result = OS.objc_msgSend(this.id, OS.sel_mainFrame);
 	return result != 0 ? new WebFrame(result) : null;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java
index 8166efa6cd..bddbfe761f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/id.java
@@ -18,12 +18,12 @@ package org.eclipse.swt.internal.cocoa;
  */
 public class id {
 
-public long /*int*/ id;
+public long id;
 
 public id() {
 }
 
-public id(long /*int*/ id) {
+public id(long id) {
 	this.id = id;
 }
 
@@ -41,7 +41,7 @@ public boolean equals(Object other) {
 	return (this.id == ((id)other).id);
 }
 
-public long /*int*/ objc_getClass() {
+public long objc_getClass() {
 	String name = getClass().getName();
 	int index = name.lastIndexOf('.');
 	if (index != -1) name = name.substring(index + 1);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/objc_super.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/objc_super.java
index 7273504939..a61cfc9c80 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/objc_super.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/objc_super.java
@@ -18,8 +18,8 @@ package org.eclipse.swt.internal.cocoa;
  */
 public class objc_super {
 	/** @field cast=(id) */
-	public long /*int*/ receiver;
+	public long receiver;
 	/** @field accessor=swt_super_class,cast=(Class) */
-	public long /*int*/ super_class;
+	public long super_class;
 	public static final int sizeof = OS.objc_super_sizeof();
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java
index 04fecbc70f..769fbd433d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java
@@ -157,7 +157,7 @@ public PrinterData open() {
 	NSPrintPanel panel = NSPrintPanel.printPanel();
 	NSPrintInfo printInfo = new NSPrintInfo(NSPrintInfo.sharedPrintInfo().copy());
 	if (printerData.duplex != SWT.DEFAULT) {
-		long /*int*/ settings = printInfo.PMPrintSettings();
+		long settings = printInfo.PMPrintSettings();
 		int duplex = printerData.duplex == PrinterData.DUPLEX_SHORT_EDGE ? OS.kPMDuplexTumble
 				: printerData.duplex == PrinterData.DUPLEX_LONG_EDGE ? OS.kPMDuplexNoTumble
 				: OS.kPMDuplexNone;
@@ -199,7 +199,7 @@ public PrinterData open() {
 	if ((getStyle () & SWT.SHEET) != 0) {
 		initClasses();
 		SWTPrintPanelDelegate delegate = (SWTPrintPanelDelegate)new SWTPrintPanelDelegate().alloc().init();
-		long /*int*/ jniRef = OS.NewGlobalRef(this);
+		long jniRef = OS.NewGlobalRef(this);
 		if (jniRef == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 		OS.object_setInstanceVariable(delegate.id, SWT_OBJECT, jniRef);
 		returnCode = -1;
@@ -212,7 +212,7 @@ public PrinterData open() {
 		response = returnCode;
 	} else {
 		display.setData(SET_MODAL_DIALOG, this);
-		response = (int)/*64*/panel.runModalWithPrintInfo(printInfo);
+		response = (int)panel.runModalWithPrintInfo(printInfo);
 	}
 	display.setData(SET_MODAL_DIALOG, null);
 	if (response != OS.NSCancelButton) {
@@ -238,14 +238,14 @@ public PrinterData open() {
 		data.copyCount = new NSNumber(dict.objectForKey(OS.NSPrintCopies)).intValue();
 		data.copyCount = 1; //TODO: Only set to 1 if the printer does the copy internally (most printers do)
 		data.orientation = new NSNumber(dict.objectForKey(OS.NSPrintOrientation)).intValue() == OS.NSLandscapeOrientation ? PrinterData.LANDSCAPE : PrinterData.PORTRAIT;
-		long /*int*/ settings = printInfo.PMPrintSettings();
+		long settings = printInfo.PMPrintSettings();
 		int outDuplexSetting[] = new int[1];
 		OS.PMGetDuplex(settings, outDuplexSetting);
 		data.duplex = outDuplexSetting[0] == OS.kPMDuplexTumble ? PrinterData.DUPLEX_SHORT_EDGE
 				: outDuplexSetting[0] == OS.kPMDuplexNoTumble ? PrinterData.DUPLEX_LONG_EDGE
 				: PrinterData.DUPLEX_NONE;
 		NSData nsData = NSKeyedArchiver.archivedDataWithRootObject(printInfo);
-		data.otherData = new byte[(int)/*64*/nsData.length()];
+		data.otherData = new byte[(int)nsData.length()];
 		C.memmove(data.otherData, nsData.bytes(), data.otherData.length);
 		printerData = data;
 	}
@@ -276,8 +276,8 @@ static boolean getSheetEnabled () {
 	return !"false".equals(System.getProperty("org.eclipse.swt.sheet"));
 }
 
-static long /*int*/ dialogProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
-	long /*int*/ [] jniRef = new long /*int*/ [1];
+static long dialogProc(long id, long sel, long arg0, long arg1, long arg2) {
+	long [] jniRef = new long [1];
 	OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
 	if (jniRef[0] == 0) return 0;
 	if (sel == OS.sel_panelDidEnd_returnCode_contextInfo_) {
@@ -293,19 +293,19 @@ void initClasses () {
 	if (OS.objc_lookUpClass (className) != 0) return;
 
 	dialogCallback5 = new Callback(getClass(), "dialogProc", 5);
-	long /*int*/ dialogProc5 = dialogCallback5.getAddress();
+	long dialogProc5 = dialogCallback5.getAddress();
 	if (dialogProc5 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 
 	byte[] types = {'*','\0'};
 	int size = C.PTR_SIZEOF, align = C.PTR_SIZEOF == 4 ? 2 : 3;
-	long /*int*/ cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
+	long cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
 	OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
 	OS.class_addMethod(cls, OS.sel_panelDidEnd_returnCode_contextInfo_, dialogProc5, "@:@i@");
 	OS.objc_registerClassPair(cls);
 }
 
-void panelDidEnd_returnCode_contextInfo(long /*int*/ id, long /*int*/ sel, long /*int*/ alert, long /*int*/ returnCode, long /*int*/ contextInfo) {
-	this.returnCode = (int)/*64*/returnCode;
+void panelDidEnd_returnCode_contextInfo(long id, long sel, long alert, long returnCode, long contextInfo) {
+	this.returnCode = (int)returnCode;
 }
 
 /**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
index e5ea0d06e8..7780f26e9f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
@@ -62,7 +62,7 @@ public static PrinterData[] getPrinterList() {
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
 		NSArray printers = NSPrinter.printerNames();
-		int count = (int)/*64*/printers.count();
+		int count = (int)printers.count();
 		PrinterData[] result = new PrinterData[count];
 		for (int i = 0; i < count; i++) {
 			NSString str = new NSString(printers.objectAtIndex(i));
@@ -216,7 +216,7 @@ protected void create(DeviceData deviceData) {
 			printInfo.setPrinter(printer);
 		}
 		if (data.duplex != SWT.DEFAULT) {
-			long /*int*/ settings = printInfo.PMPrintSettings();
+			long settings = printInfo.PMPrintSettings();
 			int duplex = data.duplex == PrinterData.DUPLEX_SHORT_EDGE ? OS.kPMDuplexTumble
 					: data.duplex == PrinterData.DUPLEX_LONG_EDGE ? OS.kPMDuplexNoTumble
 					: OS.kPMDuplexNone;
@@ -245,7 +245,7 @@ protected void create(DeviceData deviceData) {
 		window.initWithContentRect(rect, OS.NSBorderlessWindowMask, OS.NSBackingStoreBuffered, false);
 		String className = "SWTPrinterView"; //$NON-NLS-1$
 		if (OS.objc_lookUpClass(className) == 0) {
-			long /*int*/ cls = OS.objc_allocateClassPair(OS.class_NSView, className, 0);
+			long cls = OS.objc_allocateClassPair(OS.class_NSView, className, 0);
 			OS.class_addMethod(cls, OS.sel_isFlipped, OS.isFlipped_CALLBACK(), "@:");
 			OS.objc_registerClassPair(cls);
 		}
@@ -302,7 +302,7 @@ protected void destroy() {
  * @noreference This method is not intended to be referenced by clients.
  */
 @Override
-public long /*int*/ internal_new_GC(GCData data) {
+public long internal_new_GC(GCData data) {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	NSAutoreleasePool pool = null;
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
@@ -367,7 +367,7 @@ protected void init () {
  * @noreference This method is not intended to be referenced by clients.
  */
 @Override
-public void internal_dispose_GC(long /*int*/ hDC, GCData data) {
+public void internal_dispose_GC(long hDC, GCData data) {
 	if (data != null) isGCCreated = false;
 }
 
@@ -584,12 +584,12 @@ public Point getDPI() {
 	NSAutoreleasePool pool = null;
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
-		long /*int*/ pmPrintSession = printInfo.PMPrintSession();
-		long /*int*/ printer[] = new long /*int*/ [1];
-		long /*int*/ err = OS.PMSessionGetCurrentPrinter(pmPrintSession, printer);
+		long pmPrintSession = printInfo.PMPrintSession();
+		long printer[] = new long [1];
+		long err = OS.PMSessionGetCurrentPrinter(pmPrintSession, printer);
 
 		if (err == OS.noErr) {
-			long /*int*/ printSettings = printInfo.PMPrintSettings();
+			long printSettings = printInfo.PMPrintSettings();
 			short[] destType = new short[1];
 			if (OS.PMSessionGetDestinationType(pmPrintSession, printSettings, destType) == OS.noErr) {
 				if (destType[0] == OS.kPMDestinationPrinter) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java
index 609a5ae0b7..5a7b6bf79c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java
@@ -75,7 +75,7 @@ public static Program findProgram (String extension) {
 		if (ext != null) {
 			byte[] fsRef = new byte[80];
 			if (OS.LSGetApplicationForInfo(OS.kLSUnknownType, OS.kLSUnknownCreator, ext.id, OS.kLSRolesAll, fsRef, null) == OS.noErr) {
-				long /*int*/ url = OS.CFURLCreateFromFSRef(OS.kCFAllocatorDefault(), fsRef);
+				long url = OS.CFURLCreateFromFSRef(OS.kCFAllocatorDefault(), fsRef);
 				if (url != 0) {
 					NSString bundlePath = new NSURL(url).path();
 					NSBundle bundle = NSBundle.bundleWithPath(bundlePath);
@@ -105,7 +105,7 @@ public static String [] getExtensions () {
 		NSString CFBundleDocumentTypes = NSString.stringWith("CFBundleDocumentTypes");
 		NSString CFBundleTypeExtensions = NSString.stringWith("CFBundleTypeExtensions");
 		NSArray array = new NSArray(OS.NSSearchPathForDirectoriesInDomains(OS.NSAllApplicationsDirectory, OS.NSAllDomainsMask, true));
-		int count = (int)/*64*/array.count();
+		int count = (int)array.count();
 		for (int i = 0; i < count; i++) {
 			NSString path = new NSString(array.objectAtIndex(i));
 			NSFileManager fileManager = NSFileManager.defaultManager();
@@ -135,7 +135,7 @@ public static String [] getExtensions () {
 			}
 		}
 		int i = 0;
-		String[] exts = new String[(int)/*64*/supportedDocumentTypes.count()];
+		String[] exts = new String[(int)supportedDocumentTypes.count()];
 		NSEnumerator enumerator = supportedDocumentTypes.objectEnumerator();
 		id id;
 		while ((id = enumerator.nextObject()) != null) {
@@ -187,7 +187,7 @@ public static Program [] getPrograms () {
 		LinkedHashSet<Program> programs = new LinkedHashSet<>();
 		NSWorkspace workspace = NSWorkspace.sharedWorkspace();
 		NSArray array = new NSArray(OS.NSSearchPathForDirectoriesInDomains(OS.NSAllApplicationsDirectory, OS.NSAllDomainsMask, true));
-		int count = (int)/*64*/array.count();
+		int count = (int)array.count();
 		for (int i = 0; i < count; i++) {
 			NSString path = new NSString(array.objectAtIndex(i));
 			NSFileManager fileManager = NSFileManager.defaultManager();
@@ -225,7 +225,7 @@ static NSURL getURL (String fileName) {
 	if (NSFileManager.defaultManager().fileExistsAtPath(fullPath)) {
 		fullPath = NSURL.fileURLWithPath(fullPath).absoluteString();
 	}
-	long /*int*/ ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, fullPath.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
+	long ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, fullPath.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
 	NSString escapedString = new NSString(ptr);
 	NSURL url = NSURL.URLWithString(escapedString);
 	OS.CFRelease(ptr);
@@ -233,7 +233,7 @@ static NSURL getURL (String fileName) {
 }
 
 static boolean isExecutable (String fileName) {
-	long /*int*/ ptr = C.malloc(1);
+	long ptr = C.malloc(1);
 	NSString path = NSString.stringWith(fileName);
 	boolean result = false;
 	NSFileManager manager = NSFileManager.defaultManager();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
index 7f2eccdac7..529c6be886 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
@@ -31,7 +31,7 @@ class WebKit extends WebBrowser {
 	boolean loadingText, untrustedText;
 	String lastHoveredLinkURL, lastNavigateURL;
 	String html;
-	long /*int*/ identifier;
+	long identifier;
 	int resourceCount;
 	String url = ""; //$NON-NLS-1$
 	Point location;
@@ -41,7 +41,7 @@ class WebKit extends WebBrowser {
 	//TEMPORARY CODE
 //	boolean doit;
 
-	static long /*int*/ delegateClass;
+	static long delegateClass;
 	static boolean Initialized;
 	// the following Callbacks are never freed
 	static Callback Callback3, Callback4, Callback5, Callback6, Callback7;
@@ -74,7 +74,7 @@ class WebKit extends WebBrowser {
 		NativeClearSessions = () -> {
 			NSHTTPCookieStorage storage = NSHTTPCookieStorage.sharedHTTPCookieStorage();
 			NSArray cookies = storage.cookies();
-			int count = (int)/*64*/cookies.count ();
+			int count = (int)cookies.count ();
 			for (int i = 0; i < count; i++) {
 				NSHTTPCookie cookie = new NSHTTPCookie(cookies.objectAtIndex(i));
 				if (cookie.isSessionOnly()) {
@@ -87,7 +87,7 @@ class WebKit extends WebBrowser {
 			NSHTTPCookieStorage storage = NSHTTPCookieStorage.sharedHTTPCookieStorage ();
 			NSURL url = NSURL.URLWithString (NSString.stringWith (CookieUrl));
 			NSArray cookies = storage.cookiesForURL (url);
-			int count = (int)/*64*/cookies.count ();
+			int count = (int)cookies.count ();
 			if (count == 0) return;
 
 			NSString name = NSString.stringWith (CookieName);
@@ -123,21 +123,21 @@ public void create (Composite parent, int style) {
 	if (delegateClass == 0) {
 		Class webKitClass = this.getClass();
 		Callback3 = new Callback(webKitClass, "browserProc", 3); //$NON-NLS-1$
-		long /*int*/ proc3 = Callback3.getAddress();
+		long proc3 = Callback3.getAddress();
 		if (proc3 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 		Callback4 = new Callback(webKitClass, "browserProc", 4); //$NON-NLS-1$
-		long /*int*/ proc4 = Callback4.getAddress();
+		long proc4 = Callback4.getAddress();
 		if (proc4 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 		Callback5 = new Callback(webKitClass, "browserProc", 5); //$NON-NLS-1$
-		long /*int*/ proc5 = Callback5.getAddress();
+		long proc5 = Callback5.getAddress();
 		if (proc5 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 		Callback6 = new Callback(webKitClass, "browserProc", 6); //$NON-NLS-1$
-		long /*int*/ proc6 = Callback6.getAddress();
+		long proc6 = Callback6.getAddress();
 		if (proc6 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 		Callback7 = new Callback(webKitClass, "browserProc", 7); //$NON-NLS-1$
-		long /*int*/ proc7 = Callback7.getAddress();
+		long proc7 = Callback7.getAddress();
 		if (proc7 == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
-		long /*int*/ setFrameProc = OS.CALLBACK_webView_setFrame_(proc4);
+		long setFrameProc = OS.CALLBACK_webView_setFrame_(proc4);
 		if (setFrameProc == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS);
 
 		String className = "SWTWebViewDelegate"; //$NON-NLS-1$
@@ -189,7 +189,7 @@ public void create (Composite parent, int style) {
 		OS.class_addMethod(delegateClass, OS.sel_createPanelDidEnd, proc5, "@:@@@"); //$NON-NLS-1$
 		OS.objc_registerClassPair(delegateClass);
 
- 		long /*int*/ metaClass = OS.objc_getMetaClass (className);
+ 		long metaClass = OS.objc_getMetaClass (className);
 		OS.class_addMethod(metaClass, OS.sel_isSelectorExcludedFromWebScript_, proc3, "@:@"); //$NON-NLS-1$
 		OS.class_addMethod(metaClass, OS.sel_webScriptNameForSelector_, proc3, "@:@"); //$NON-NLS-1$
 	}
@@ -288,7 +288,7 @@ public boolean back() {
 	return webView.goBack();
 }
 
-static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+static long browserProc(long id, long sel, long arg0) {
 	if (id == delegateClass) {
 		if (sel == OS.sel_isSelectorExcludedFromWebScript_) {
 			return isSelectorExcludedFromWebScript (arg0) ? 1 : 0;
@@ -316,7 +316,7 @@ static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/
 	return 0;
 }
 
-static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+static long browserProc(long id, long sel, long arg0, long arg1) {
 	Display d = Display.getCurrent();
 	if (d == null || d.isDisposed()) return 0;
 	Widget widget = d.findWidget(id);
@@ -360,7 +360,7 @@ static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/
 	return 0;
 }
 
-static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
+static long browserProc(long id, long sel, long arg0, long arg1, long arg2) {
 	Display d = Display.getCurrent();
 	if (d == null || d.isDisposed()) return 0;
 	Widget widget = d.findWidget(id);
@@ -392,7 +392,7 @@ static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/
 	return 0;
 }
 
-static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
+static long browserProc(long id, long sel, long arg0, long arg1, long arg2, long arg3) {
 	Display d = Display.getCurrent();
 	if (d == null || d.isDisposed()) return 0;
 	Widget widget = d.findWidget(id);
@@ -411,7 +411,7 @@ static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/
 	return 0;
 }
 
-static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ arg4) {
+static long browserProc(long id, long sel, long arg0, long arg1, long arg2, long arg3, long arg4) {
 	Display d = Display.getCurrent();
 	if (d == null || d.isDisposed()) return 0;
 	Widget widget = d.findWidget(id);
@@ -429,11 +429,11 @@ static long /*int*/ browserProc(long /*int*/ id, long /*int*/ sel, long /*int*/
 	return 0;
 }
 
-static boolean isSelectorExcludedFromWebScript (long /*int*/ aSelector) {
+static boolean isSelectorExcludedFromWebScript (long aSelector) {
 	return !(aSelector == OS.sel_callJava || aSelector == OS.sel_callRunBeforeUnloadConfirmPanelWithMessage);
 }
 
-static long /*int*/ webScriptNameForSelector (long /*int*/ aSelector) {
+static long webScriptNameForSelector (long aSelector) {
 	if (aSelector == OS.sel_callJava) {
 		return NSString.stringWith ("callJava").id; //$NON-NLS-1$
 	}
@@ -483,15 +483,15 @@ boolean close (boolean showPrompters) {
 @Override
 public boolean execute (String script) {
 	WebFrame frame = webView.mainFrame();
-	long /*int*/ context = frame.globalContext();
+	long context = frame.globalContext();
 
 	byte[] bytes = (script + '\0').getBytes(StandardCharsets.UTF_8); //$NON-NLS-1$
-	long /*int*/ scriptString = OS.JSStringCreateWithUTF8CString(bytes);
+	long scriptString = OS.JSStringCreateWithUTF8CString(bytes);
 
 	bytes = (getUrl() + '\0').getBytes(StandardCharsets.UTF_8); //$NON-NLS-1$
-	long /*int*/ urlString = OS.JSStringCreateWithUTF8CString(bytes);
+	long urlString = OS.JSStringCreateWithUTF8CString(bytes);
 
-	long /*int*/ result = OS.JSEvaluateScript(context, scriptString, 0, urlString, 0, null);
+	long result = OS.JSEvaluateScript(context, scriptString, 0, urlString, 0, null);
 	OS.JSStringRelease(urlString);
 	OS.JSStringRelease(scriptString);
 	return result != 0;
@@ -575,7 +575,7 @@ public boolean setUrl(String url, String postData, String[] headers) {
 
 	NSString str = NSString.stringWith(url);
 	NSString unescapedStr = NSString.stringWith("%#"); //$NON-NLS-1$
-	long /*int*/ ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, str.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
+	long ptr = OS.CFURLCreateStringByAddingPercentEscapes(0, str.id, unescapedStr.id, 0, OS.kCFStringEncodingUTF8);
 	NSString escapedString = new NSString(ptr);
 	NSURL inURL = NSURL.URLWithString(escapedString);
 	OS.CFRelease(ptr);
@@ -629,13 +629,13 @@ boolean translateMnemonics() {
 
 /* WebFrameLoadDelegate */
 
-void webView_didChangeLocationWithinPageForFrame(long /*int*/ sender, long /*int*/ frameID) {
+void webView_didChangeLocationWithinPageForFrame(long sender, long frameID) {
 	WebFrame frame = new WebFrame(frameID);
 	WebDataSource dataSource = frame.dataSource();
 	NSURLRequest request = dataSource.request();
 	NSURL url = request.URL();
 	NSString s = url.absoluteString();
-	int length = (int)/*64*/s.length();
+	int length = (int)s.length();
 	if (length == 0) return;
 	String url2 = s.getString();
 	/*
@@ -673,7 +673,7 @@ void webView_didChangeLocationWithinPageForFrame(long /*int*/ sender, long /*int
 	}
 }
 
-void webView_didFailProvisionalLoadWithError_forFrame(long /*int*/ sender, long /*int*/ error, long /*int*/ frame) {
+void webView_didFailProvisionalLoadWithError_forFrame(long sender, long error, long frame) {
 	if (frame == webView.mainFrame().id) {
 		/*
 		* Feature on WebKit.  The identifier is used here as a marker for the events
@@ -692,7 +692,7 @@ void webView_didFailProvisionalLoadWithError_forFrame(long /*int*/ sender, long
 	}
 
 	NSError nserror = new NSError(error);
-	long /*int*/ errorCode = nserror.code();
+	long errorCode = nserror.code();
 	if (OS.NSURLErrorBadURL < errorCode) return;
 
 	NSURL failingURL = null;
@@ -706,9 +706,9 @@ void webView_didFailProvisionalLoadWithError_forFrame(long /*int*/ sender, long
 		/* handle invalid certificate error */
 		id certificates = info.objectForKey(NSString.stringWith("NSErrorPeerCertificateChainKey")); //$NON-NLS-1$
 
-		long /*int*/[] policySearch = new long /*int*/[1];
-		long /*int*/[] policyRef = new long /*int*/[1];
-		long /*int*/[] trustRef = new long /*int*/[1];
+		long[] policySearch = new long[1];
+		long[] policyRef = new long[1];
+		long[] trustRef = new long[1];
 		boolean success = false;
 		int result = OS.SecPolicySearchCreate(OS.CSSM_CERT_X_509v3, 0, 0, policySearch);
 		if (result == 0 && policySearch[0] != 0) {
@@ -747,19 +747,19 @@ void webView_didFailProvisionalLoadWithError_forFrame(long /*int*/ sender, long
 	}
 }
 
-void createPanelDidEnd(long /*int*/ sheet, long /*int*/ returnCode, long /*int*/ contextInfo) {
+void createPanelDidEnd(long sheet, long returnCode, long contextInfo) {
 	NSURL failingURL = new NSURL(contextInfo);
 	failingURL.autorelease();
 	if (returnCode != OS.NSFileHandlingPanelOKButton) return;	/* nothing more to do */
 
-	long /*int*/ method = OS.class_getClassMethod(OS.class_NSURLRequest, OS.sel_setAllowsAnyHTTPSCertificate);
+	long method = OS.class_getClassMethod(OS.class_NSURLRequest, OS.sel_setAllowsAnyHTTPSCertificate);
 	if (method != 0) {
 		OS.objc_msgSend(OS.class_NSURLRequest, OS.sel_setAllowsAnyHTTPSCertificate, 1, failingURL.host().id);
 		setUrl(failingURL.absoluteString().getString(), null, null);
 	}
 }
 
-void webView_didFinishLoadForFrame(long /*int*/ sender, long /*int*/ frameID) {
+void webView_didFinishLoadForFrame(long sender, long frameID) {
 	if (frameID == webView.mainFrame().id) {
 		/*
 		 * If html is not null then there is html from a previous setText() call
@@ -841,7 +841,7 @@ void webView_didFinishLoadForFrame(long /*int*/ sender, long /*int*/ frameID) {
 	}
 }
 
-void hookDOMKeyListeners(long /*int*/ frameID) {
+void hookDOMKeyListeners(long frameID) {
 	WebFrame frame = new WebFrame(frameID);
 	DOMDocument document = frame.DOMDocument();
 	if (document == null) return;
@@ -853,7 +853,7 @@ void hookDOMKeyListeners(long /*int*/ frameID) {
 	document.addEventListener(type, delegate, false);
 }
 
-void hookDOMMouseListeners(long /*int*/ frameID) {
+void hookDOMMouseListeners(long frameID) {
 	WebFrame frame = new WebFrame(frameID);
 	DOMDocument document = frame.DOMDocument();
 	if (document == null) return;
@@ -871,7 +871,7 @@ void hookDOMMouseListeners(long /*int*/ frameID) {
 	document.addEventListener(type, delegate, false);
 }
 
-void webView_didReceiveTitle_forFrame(long /*int*/ sender, long /*int*/ titleID, long /*int*/ frameID) {
+void webView_didReceiveTitle_forFrame(long sender, long titleID, long frameID) {
 	if (frameID == webView.mainFrame().id) {
 		NSString title = new NSString(titleID);
 		String newTitle = title.getString();
@@ -885,7 +885,7 @@ void webView_didReceiveTitle_forFrame(long /*int*/ sender, long /*int*/ titleID,
 	}
 }
 
-void webView_didStartProvisionalLoadForFrame(long /*int*/ sender, long /*int*/ frameID) {
+void webView_didStartProvisionalLoadForFrame(long sender, long frameID) {
 	/*
 	* This code is intentionally commented.  WebFrameLoadDelegate:didStartProvisionalLoadForFrame is
 	* called before WebResourceLoadDelegate:willSendRequest and
@@ -898,13 +898,13 @@ void webView_didStartProvisionalLoadForFrame(long /*int*/ sender, long /*int*/ f
 //	}
 }
 
-void webView_didCommitLoadForFrame(long /*int*/ sender, long /*int*/ frameID) {
+void webView_didCommitLoadForFrame(long sender, long frameID) {
 	WebFrame frame = new WebFrame(frameID);
 	WebDataSource dataSource = frame.dataSource();
 	NSURLRequest request = dataSource.request();
 	NSURL url = request.URL();
 	NSString s = url.absoluteString();
-	int length = (int)/*64*/s.length();
+	int length = (int)s.length();
 	if (length == 0) return;
 	String url2 = s.getString();
 	/*
@@ -977,7 +977,7 @@ void webView_didCommitLoadForFrame(long /*int*/ sender, long /*int*/ frameID) {
 	}
 }
 
-void webView_windowScriptObjectAvailable (long /*int*/ webView, long /*int*/ windowScriptObject) {
+void webView_windowScriptObjectAvailable (long webView, long windowScriptObject) {
 	NSObject scriptObject = new NSObject (windowScriptObject);
 	NSString key = NSString.stringWith ("external"); //$NON-NLS-1$
 	scriptObject.setValue (delegate, key);
@@ -985,7 +985,7 @@ void webView_windowScriptObjectAvailable (long /*int*/ webView, long /*int*/ win
 
 /* WebResourceLoadDelegate */
 
-void webView_resource_didFinishLoadingFromDataSource(long /*int*/ sender, long /*int*/ identifier, long /*int*/ dataSource) {
+void webView_resource_didFinishLoadingFromDataSource(long sender, long identifier, long dataSource) {
 	/*
 	* Feature on WebKit.  The identifier is used here as a marker for the events
 	* related to the top frame and the URL changes related to that top frame as
@@ -1003,7 +1003,7 @@ void webView_resource_didFinishLoadingFromDataSource(long /*int*/ sender, long /
 	//if (this.identifier == identifier) this.identifier = 0;
 }
 
-void webView_resource_didFailLoadingWithError_fromDataSource(long /*int*/ sender, long /*int*/ identifier, long /*int*/ error, long /*int*/ dataSource) {
+void webView_resource_didFailLoadingWithError_fromDataSource(long sender, long identifier, long error, long dataSource) {
 	/*
 	* Feature on WebKit.  The identifier is used here as a marker for the events
 	* related to the top frame and the URL changes related to that top frame as
@@ -1021,7 +1021,7 @@ void webView_resource_didFailLoadingWithError_fromDataSource(long /*int*/ sender
 	//if (this.identifier == identifier) this.identifier = 0;
 }
 
-void webView_resource_didReceiveAuthenticationChallenge_fromDataSource (long /*int*/ sender, long /*int*/ identifier, long /*int*/ challenge, long /*int*/ dataSource) {
+void webView_resource_didReceiveAuthenticationChallenge_fromDataSource (long sender, long identifier, long challenge, long dataSource) {
 	NSURLAuthenticationChallenge nsChallenge = new NSURLAuthenticationChallenge (challenge);
 
 	/*
@@ -1051,11 +1051,11 @@ void webView_resource_didReceiveAuthenticationChallenge_fromDataSource (long /*i
 	}
 
 	/* no listener handled the challenge, so try to invoke the native panel */
-	long /*int*/ cls = OS.class_WebPanelAuthenticationHandler;
+	long cls = OS.class_WebPanelAuthenticationHandler;
 	if (cls != 0) {
-		long /*int*/ method = OS.class_getClassMethod (cls, OS.sel_sharedHandler);
+		long method = OS.class_getClassMethod (cls, OS.sel_sharedHandler);
 		if (method != 0) {
-			long /*int*/ handler = OS.objc_msgSend (cls, OS.sel_sharedHandler);
+			long handler = OS.objc_msgSend (cls, OS.sel_sharedHandler);
 			if (handler != 0) {
 				OS.objc_msgSend (handler, OS.sel_startAuthentication, challenge, webView.window ().id);
 				return;
@@ -1159,7 +1159,7 @@ boolean showAuthenticationDialog (final String[] user, final String[] password,
 	return result[0];
 }
 
-long /*int*/ webView_identifierForInitialRequest_fromDataSource(long /*int*/ sender, long /*int*/ request, long /*int*/ dataSourceID) {
+long webView_identifierForInitialRequest_fromDataSource(long sender, long request, long dataSourceID) {
 	ProgressEvent progress = new ProgressEvent(browser);
 	progress.display = browser.getDisplay();
 	progress.widget = browser;
@@ -1180,7 +1180,7 @@ long /*int*/ webView_identifierForInitialRequest_fromDataSource(long /*int*/ sen
 
 }
 
-long /*int*/ webView_resource_willSendRequest_redirectResponse_fromDataSource(long /*int*/ sender, long /*int*/ identifier, long /*int*/ request, long /*int*/ redirectResponse, long /*int*/ dataSource) {
+long webView_resource_willSendRequest_redirectResponse_fromDataSource(long sender, long identifier, long request, long redirectResponse, long dataSource) {
 	NSURLRequest nsRequest = new NSURLRequest (request);
 	NSURL url = nsRequest.URL ();
 	if (url.isFileURL ()) {
@@ -1194,7 +1194,7 @@ long /*int*/ webView_resource_willSendRequest_redirectResponse_fromDataSource(lo
 
 /* UIDelegate */
 
-long /*int*/ webView_createWebViewWithRequest(long /*int*/ sender, long /*int*/ request) {
+long webView_createWebViewWithRequest(long sender, long request) {
 	WindowEvent newEvent = new WindowEvent(browser);
 	newEvent.display = browser.getDisplay();
 	newEvent.widget = browser;
@@ -1219,7 +1219,7 @@ long /*int*/ webView_createWebViewWithRequest(long /*int*/ sender, long /*int*/
 	return result != null ? result.id : 0;
 }
 
-void webViewShow(long /*int*/ sender) {
+void webViewShow(long sender) {
 	/*
 	* Feature on WebKit.  WebKit expects the application to
 	* create a new Window using the Objective C Cocoa API in response
@@ -1259,7 +1259,7 @@ void webViewShow(long /*int*/ sender) {
 	size = null;
 }
 
-void webView_setFrame(long /*int*/ sender, long /*int*/ frame) {
+void webView_setFrame(long sender, long frame) {
 	NSRect rect = new NSRect();
 	OS.memmove(rect, frame, NSRect.sizeof);
 	/* convert to SWT system coordinates */
@@ -1268,18 +1268,18 @@ void webView_setFrame(long /*int*/ sender, long /*int*/ frame) {
 	size = new Point((int)rect.width, (int)rect.height);
 }
 
-void webViewFocus(long /*int*/ sender) {
+void webViewFocus(long sender) {
 }
 
-void webViewUnfocus(long /*int*/ sender) {
+void webViewUnfocus(long sender) {
 }
 
-NSNumber callRunBeforeUnloadConfirmPanelWithMessage(long /*int*/ messageID, long /*int*/ arg) {
+NSNumber callRunBeforeUnloadConfirmPanelWithMessage(long messageID, long arg) {
 	boolean result = webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame (0, messageID, 0);
 	return NSNumber.numberWithBool (result);
 }
 
-boolean webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame(long /*int*/ sender, long /*int*/ messageID, long /*int*/ frame) {
+boolean webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame(long sender, long messageID, long frame) {
 	NSString message = new NSString(messageID);
 	StringBuffer text = new StringBuffer(Compatibility.getMessage("SWT_OnBeforeUnload_Message1")); //$NON-NLS-1$
 	text.append("\n\n"); //$NON-NLS-1$
@@ -1291,7 +1291,7 @@ boolean webView_runBeforeUnloadConfirmPanelWithMessage_initiatedByFrame(long /*i
 	return messageBox.open() == SWT.OK;
 }
 
-void webView_runJavaScriptAlertPanelWithMessage(long /*int*/ sender, long /*int*/ messageID) {
+void webView_runJavaScriptAlertPanelWithMessage(long sender, long messageID) {
 	NSString message = new NSString(messageID);
 	String text = message.getString();
 
@@ -1301,7 +1301,7 @@ void webView_runJavaScriptAlertPanelWithMessage(long /*int*/ sender, long /*int*
 	messageBox.open();
 }
 
-int webView_runJavaScriptConfirmPanelWithMessage(long /*int*/ sender, long /*int*/ messageID) {
+int webView_runJavaScriptConfirmPanelWithMessage(long sender, long messageID) {
 	NSString message = new NSString(messageID);
 	String text = message.getString();
 
@@ -1311,7 +1311,7 @@ int webView_runJavaScriptConfirmPanelWithMessage(long /*int*/ sender, long /*int
 	return messageBox.open() == SWT.OK ? 1 : 0;
 }
 
-void webView_runOpenPanelForFileButtonWithResultListener(long /*int*/ sender, long /*int*/ resultListenerID) {
+void webView_runOpenPanelForFileButtonWithResultListener(long sender, long resultListenerID) {
 	FileDialog dialog = new FileDialog(browser.getShell(), SWT.NONE);
 	String result = dialog.open();
 	WebOpenPanelResultListener resultListener = new WebOpenPanelResultListener(resultListenerID);
@@ -1322,7 +1322,7 @@ void webView_runOpenPanelForFileButtonWithResultListener(long /*int*/ sender, lo
 	resultListener.chooseFilename(NSString.stringWith(result));
 }
 
-void webViewClose(long /*int*/ sender) {
+void webViewClose(long sender) {
 	Shell parent = browser.getShell();
 	WindowEvent newEvent = new WindowEvent(browser);
 	newEvent.display = browser.getDisplay();
@@ -1347,7 +1347,7 @@ void webViewClose(long /*int*/ sender) {
 	parent.setSize(pt.x, pt.y);
 }
 
-long /*int*/ webView_contextMenuItemsForElement_defaultMenuItems(long /*int*/ sender, long /*int*/ element, long /*int*/ defaultMenuItems) {
+long webView_contextMenuItemsForElement_defaultMenuItems(long sender, long element, long defaultMenuItems) {
 	Point pt = browser.getDisplay().getCursorLocation();
 	Event event = new Event();
 	event.x = pt.x;
@@ -1365,14 +1365,14 @@ long /*int*/ webView_contextMenuItemsForElement_defaultMenuItems(long /*int*/ se
 	return defaultMenuItems;
 }
 
-void webView_setStatusBarVisible(long /*int*/ sender, boolean visible) {
+void webView_setStatusBarVisible(long sender, boolean visible) {
 	/* Note.  Webkit only emits the notification when the status bar should be hidden. */
 	statusBar = visible;
 }
 
-void webView_setStatusText(long /*int*/ sender, long /*int*/ textID) {
+void webView_setStatusText(long sender, long textID) {
 	NSString text = new NSString(textID);
-	int length = (int)/*64*/text.length();
+	int length = (int)text.length();
 	if (length == 0) return;
 
 	StatusTextEvent statusText = new StatusTextEvent(browser);
@@ -1384,15 +1384,15 @@ void webView_setStatusText(long /*int*/ sender, long /*int*/ textID) {
 	}
 }
 
-void webView_setResizable(long /*int*/ sender, boolean visible) {
+void webView_setResizable(long sender, boolean visible) {
 }
 
-void webView_setToolbarsVisible(long /*int*/ sender, boolean visible) {
+void webView_setToolbarsVisible(long sender, boolean visible) {
 	/* Note.  Webkit only emits the notification when the tool bar should be hidden. */
 	toolBar = visible;
 }
 
-void webView_mouseDidMoveOverElement_modifierFlags (long /*int*/ sender, long /*int*/ elementInformationID, long /*int*/ modifierFlags) {
+void webView_mouseDidMoveOverElement_modifierFlags (long sender, long elementInformationID, long modifierFlags) {
 	if (elementInformationID == 0) return;
 
 	NSString key = NSString.stringWith(WebElementLinkURLKey);
@@ -1413,7 +1413,7 @@ void webView_mouseDidMoveOverElement_modifierFlags (long /*int*/ sender, long /*
 	}
 
 	NSString url = new NSURL(value.id).absoluteString();
-	int length = (int)/*64*/url.length();
+	int length = (int)url.length();
 	String urlString;
 	if (length == 0) {
 		urlString = "";	//$NON-NLS-1$
@@ -1432,7 +1432,7 @@ void webView_mouseDidMoveOverElement_modifierFlags (long /*int*/ sender, long /*
 	}
 }
 
-void webView_printFrameView (long /*int*/ sender, long /*int*/ frameViewID) {
+void webView_printFrameView (long sender, long frameViewID) {
 	WebFrameView view = new WebFrameView(frameViewID);
 	boolean viewPrint = view.documentViewShouldHandlePrint();
 	if (viewPrint) {
@@ -1446,7 +1446,7 @@ void webView_printFrameView (long /*int*/ sender, long /*int*/ frameViewID) {
 
 /* PolicyDelegate */
 
-void webView_decidePolicyForMIMEType_request_frame_decisionListener(long /*int*/ sender, long /*int*/ type, long /*int*/ request, long /*int*/ frame, long /*int*/ listenerID) {
+void webView_decidePolicyForMIMEType_request_frame_decisionListener(long sender, long type, long request, long frame, long listenerID) {
 	boolean canShow = WebView.canShowMIMEType(new NSString(type));
 	WebPolicyDecisionListener listener = new WebPolicyDecisionListener(listenerID);
 	if (canShow) {
@@ -1456,7 +1456,7 @@ void webView_decidePolicyForMIMEType_request_frame_decisionListener(long /*int*/
 	}
 }
 
-void webView_decidePolicyForNavigationAction_request_frame_decisionListener(long /*int*/ sender, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frame, long /*int*/ listenerID) {
+void webView_decidePolicyForNavigationAction_request_frame_decisionListener(long sender, long actionInformation, long request, long frame, long listenerID) {
 	NSURL url = new NSURLRequest(request).URL();
 	WebPolicyDecisionListener listener = new WebPolicyDecisionListener(listenerID);
 
@@ -1520,17 +1520,17 @@ void webView_decidePolicyForNavigationAction_request_frame_decisionListener(long
 	}
 }
 
-void webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener(long /*int*/ sender, long /*int*/ actionInformation, long /*int*/ request, long /*int*/ frameName, long /*int*/ listenerID) {
+void webView_decidePolicyForNewWindowAction_request_newFrameName_decisionListener(long sender, long actionInformation, long request, long frameName, long listenerID) {
 	WebPolicyDecisionListener listener = new WebPolicyDecisionListener(listenerID);
 	listener.use();
 }
 
-void webView_unableToImplementPolicyWithError_frame(long /*int*/ sender, long /*int*/ error, long /*int*/ frame) {
+void webView_unableToImplementPolicyWithError_frame(long sender, long error, long frame) {
 }
 
 /* WebDownload */
 
-void download_decideDestinationWithSuggestedFilename(long /*int*/ downloadId, long /*int*/ filename) {
+void download_decideDestinationWithSuggestedFilename(long downloadId, long filename) {
 	NSString string = new NSString(filename);
 	String name = string.getString();
 	FileDialog dialog = new FileDialog(browser.getShell(), SWT.SAVE);
@@ -1548,7 +1548,7 @@ void download_decideDestinationWithSuggestedFilename(long /*int*/ downloadId, lo
 
 /* DOMEventListener */
 
-void handleEvent(long /*int*/ evtId) {
+void handleEvent(long evtId) {
 	NSString string = new NSString(OS.objc_msgSend(evtId, OS.sel_type));
 	String type = string.getString();
 
@@ -1694,9 +1694,9 @@ void handleEvent(long /*int*/ evtId) {
 
 /* external */
 
-Object convertToJava (long /*int*/ value) {
+Object convertToJava (long value) {
 	NSObject object = new NSObject (value);
-	long /*int*/ clazz = OS.objc_lookUpClass ("NSString"); //$NON-NLS-1$
+	long clazz = OS.objc_lookUpClass ("NSString"); //$NON-NLS-1$
 	if (object.isKindOfClass (clazz)) {
 		NSString string = new NSString (value);
 		return string.getString ();
@@ -1704,7 +1704,7 @@ Object convertToJava (long /*int*/ value) {
 	clazz = OS.objc_lookUpClass ("NSNumber"); //$NON-NLS-1$
 	if (object.isKindOfClass (clazz)) {
 		NSNumber number = new NSNumber (value);
-		long /*int*/ ptr = number.objCType ();
+		long ptr = number.objCType ();
 		byte[] type = new byte[1];
 		C.memmove (type, ptr, 1);
 		if (type[0] == 'c' || type[0] == 'B') {
@@ -1742,7 +1742,7 @@ Object convertToJava (long /*int*/ value) {
 
 NSObject convertToJS (Object value) {
 	if (value == null) {
-		long /*int*/ result = OS.objc_msgSend (OS.class_NSNull, OS.sel_null);
+		long result = OS.objc_msgSend (OS.class_NSNull, OS.sel_null);
 		return result != 0 ? new NSObject (result) : null;
 	}
 	if (value instanceof String) {
@@ -1768,10 +1768,10 @@ NSObject convertToJS (Object value) {
 	return null;
 }
 
-NSObject callJava (long /*int*/ index, long /*int*/ token, long /*int*/ args, long /*int*/ arg1) {
+NSObject callJava (long index, long token, long args, long arg1) {
 	Object returnValue = null;
 	NSObject object = new NSObject (index);
-	long /*int*/ clazz = OS.objc_lookUpClass ("NSNumber"); //$NON-NLS-1$
+	long clazz = OS.objc_lookUpClass ("NSNumber"); //$NON-NLS-1$
 	if (object.isKindOfClass (clazz)) {
 		NSNumber number = new NSNumber (index);
 		Object key = number.intValue ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java
index 57fa683574..7fdfd5a9bf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java
@@ -47,7 +47,7 @@ public final class Color extends Resource {
 	 *
 	 * @noreference This field is not intended to be referenced by clients.
 	 */
-	public double /*float*/ [] handle;
+	public double [] handle;
 
 Color(Device device) {
 	super(device);
@@ -226,7 +226,7 @@ public boolean equals(Object object) {
 	if (object == this) return true;
 	if (!(object instanceof Color)) return false;
 	Color color = (Color)object;
-	double /*float*/ [] rgbColor = color.handle;
+	double [] rgbColor = color.handle;
 	if (handle == rgbColor) return true;
 	return device == color.device &&
 		(int)(handle[0] * 255) == (int)(rgbColor[0] * 255) &&
@@ -353,8 +353,8 @@ public RGBA getRGBA () {
  *
  * @noreference This method is not intended to be referenced by clients.
  */
-public static Color cocoa_new(Device device, double /*float*/ [] handle) {
-	double /*float*/ [] rgbColor = handle;
+public static Color cocoa_new(Device device, double [] handle) {
+	double [] rgbColor = handle;
 	Color color = new Color(device);
 	color.handle = rgbColor;
 	return color;
@@ -376,8 +376,8 @@ public static Color cocoa_new(Device device, double /*float*/ [] handle) {
  *
  * @noreference This method is not intended to be referenced by clients.
  */
-public static Color cocoa_new(Device device, double /*float*/ [] handle, int alpha) {
-	double /*float*/ [] rgbColor = handle;
+public static Color cocoa_new(Device device, double [] handle, int alpha) {
+	double [] rgbColor = handle;
 	Color color = new Color(device);
 	color.handle = rgbColor;
 	color.handle[3] = alpha / 255f;
@@ -407,7 +407,7 @@ void init(int red, int green, int blue, int alpha) {
 		(alpha > 255) || (alpha < 0)) {
 			SWT.error(SWT.ERROR_INVALID_ARGUMENT);
 	}
-	double /*float*/ [] rgbColor = new double /*float*/ [4];
+	double [] rgbColor = new double [4];
 	rgbColor[0] = red / 255f;
 	rgbColor[1] = green / 255f;
 	rgbColor[2] = blue / 255f;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Cursor.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Cursor.java
index 1811b92c9d..152d22434e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Cursor.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Cursor.java
@@ -112,7 +112,7 @@ public final class Cursor extends Resource {
 		if (!new NSObject(OS.class_NSCursor).respondsToSelector(OS.sel_busyButClickableCursor)) {
 			return null;
 		}
-		long /*int*/ result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_busyButClickableCursor);
+		long result = OS.objc_msgSend(OS.class_NSCursor, OS.sel_busyButClickableCursor);
 		return result != 0 ? new NSCursor(result) : null;
 	}
 
@@ -479,7 +479,7 @@ public boolean equals (Object object) {
  */
 @Override
 public int hashCode () {
-	return handle != null ? (int)/*64*/handle.id : 0;
+	return handle != null ? (int)handle.id : 0;
 }
 
 /**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java
index 0227989dc7..583aa79a96 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java
@@ -324,7 +324,7 @@ public int getDepth () {
 	checkDevice ();
 	NSScreen primaryScreen = getPrimaryScreen();
 	if (primaryScreen == null) return 0;
-	return (int)/*64*/OS.NSBitsPerPixelFromDepth(primaryScreen.depth());
+	return (int)OS.NSBitsPerPixelFromDepth(primaryScreen.depth());
 }
 
 /**
@@ -370,19 +370,19 @@ public FontData[] getFontList (String faceName, boolean scalable) {
 	NSArray families = NSFontManager.sharedFontManager().availableFontFamilies();
 	FontData[] fds = new FontData[100];
 	if (families != null) {
-		long /*int*/ familyCount = families.count();
+		long familyCount = families.count();
 		for (int i = 0; i < familyCount; i++) {
 			NSString nsFamily = new NSString(families.objectAtIndex(i));
 			String name = nsFamily.getString();
 			NSArray fonts = NSFontManager.sharedFontManager().availableMembersOfFontFamily(nsFamily);
 
 			if (fonts != null) {
-				int fontCount = (int)/*64*/fonts.count();
+				int fontCount = (int)fonts.count();
 				for (int j = 0; j < fontCount; j++) {
 					NSArray fontDetails = new NSArray(fonts.objectAtIndex(j));
 					String nsName = new NSString(fontDetails.objectAtIndex(0)).getString();
-					long /*int*/ weight = new NSNumber(fontDetails.objectAtIndex(2)).integerValue();
-					long /*int*/ traits = new NSNumber(fontDetails.objectAtIndex(3)).integerValue();
+					long weight = new NSNumber(fontDetails.objectAtIndex(2)).integerValue();
+					long traits = new NSNumber(fontDetails.objectAtIndex(3)).integerValue();
 					int style = SWT.NORMAL;
 					if ((traits & OS.NSItalicFontMask) != 0) style |= SWT.ITALIC;
 					if (weight == 9) style |= SWT.BOLD;
@@ -428,7 +428,7 @@ Point getScreenDPI () {
 	NSDictionary dictionary = screen.deviceDescription();
 	NSValue value = new NSValue(dictionary.objectForKey(new id(OS.NSDeviceResolution())).id);
 	NSSize size = value.sizeValue();
-	double /*float*/ scaling = 1;
+	double scaling = 1;
 	if (OS.VERSION >= 0x1070) {
 		scaling = screen.backingScaleFactor();
 	}
@@ -559,7 +559,7 @@ protected void init () {
 
 	/* Initialize the system font slot */
 	boolean smallFonts = System.getProperty("org.eclipse.swt.internal.carbon.smallFonts") != null;
-	double /*float*/ systemFontSize = smallFonts ? NSFont.smallSystemFontSize() : NSFont.systemFontSize();
+	double systemFontSize = smallFonts ? NSFont.smallSystemFontSize() : NSFont.systemFontSize();
 	Point dpi = this.dpi = getDPI(), screenDPI = getScreenDPI();
 	NSFont font = NSFont.systemFontOfSize(systemFontSize * dpi.y / screenDPI.y);
 	font.retain();
@@ -582,7 +582,7 @@ protected void init () {
  * @noreference This method is not intended to be referenced by clients.
  */
 @Override
-public abstract long /*int*/ internal_new_GC (GCData data);
+public abstract long internal_new_GC (GCData data);
 
 /**
  * Invokes platform specific functionality to dispose a GC handle.
@@ -600,7 +600,7 @@ public abstract long /*int*/ internal_new_GC (GCData data);
  * @noreference This method is not intended to be referenced by clients.
  */
 @Override
-public abstract void internal_dispose_GC (long /*int*/ hDC, GCData data);
+public abstract void internal_dispose_GC (long hDC, GCData data);
 
 /**
  * Returns <code>true</code> if the device has been disposed,
@@ -639,7 +639,7 @@ public boolean loadFont (String path) {
 	if (path == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	boolean result = false;
 	NSString nsPath = NSString.stringWith(path);
-	long /*int*/ fsRepresentation = nsPath.fileSystemRepresentation();
+	long fsRepresentation = nsPath.fileSystemRepresentation();
 
 	if (fsRepresentation != 0) {
 		byte [] fsRef = new byte [80];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
index f97d727e85..a62cf0519c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
@@ -259,14 +259,14 @@ public FontData[] getFontData() {
 		NSString str = handle.fontName();
 		String nsName = str.getString();
 		NSFontManager manager = NSFontManager.sharedFontManager();
-		long /*int*/ traits = manager.traitsOfFont(handle);
+		long traits = manager.traitsOfFont(handle);
 		int style = SWT.NORMAL;
 		if ((traits & OS.NSItalicFontMask) != 0) style |= SWT.ITALIC;
 		if ((traits & OS.NSBoldFontMask) != 0) style |= SWT.BOLD;
 		if ((extraTraits & OS.NSItalicFontMask) != 0) style |= SWT.ITALIC;
 		if ((extraTraits & OS.NSBoldFontMask) != 0) style |= SWT.BOLD;
 		Point dpi = device.dpi, screenDPI = device.getScreenDPI();
-		FontData data = new FontData(name, (float)/*64*/handle.pointSize() * screenDPI.y / dpi.y, style);
+		FontData data = new FontData(name, (float)handle.pointSize() * screenDPI.y / dpi.y, style);
 		data.nsName = nsName;
 		return new FontData[]{data};
 	} finally {
@@ -307,7 +307,7 @@ public static Font cocoa_new(Device device, NSFont handle) {
  */
 @Override
 public int hashCode() {
-	return handle != null ? (int)/*64*/handle.id : 0;
+	return handle != null ? (int)handle.id : 0;
 }
 
 void init(String name, float height, int style, String nsName) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
index 612af9ebb6..f5587787fc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
@@ -81,8 +81,8 @@ public final class GC extends Resource {
 	CGPathElement element;
 	int count, typeCount;
 	byte[] types;
-	double /*float*/[] points;
-	double /*float*/ [] point;
+	double[] points;
+	double [] point;
 
 	static final int TAB_COUNT = 32;
 
@@ -259,7 +259,7 @@ public GC(Drawable drawable, int style) {
 	try {
 		GCData data = new GCData();
 		data.style = checkStyle(style);
-		long /*int*/ contextId = drawable.internal_new_GC(data);
+		long contextId = drawable.internal_new_GC(data);
 		Device device = data.device;
 		if (device == null) device = Device.getDevice();
 		if (device == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
@@ -295,13 +295,13 @@ static int checkStyle (int style) {
  */
 public static GC cocoa_new(Drawable drawable, GCData data) {
 	GC gc = new GC();
-	long /*int*/ context = drawable.internal_new_GC(data);
+	long context = drawable.internal_new_GC(data);
 	gc.device = data.device;
 	gc.init(drawable, data, context);
 	return gc;
 }
 
-long /*int*/ applierFunc(long /*int*/ info, long /*int*/ elementPtr) {
+long applierFunc(long info, long elementPtr) {
 	OS.memmove(element, elementPtr, CGPathElement.sizeof);
 	int type = 0, length = 1;
 	switch (element.type) {
@@ -377,7 +377,7 @@ NSAutoreleasePool checkGC (int mask) {
 		if (pattern != null) {
 			if (pattern.color != null) pattern.color.setStroke();
 		} else {
-			double /*float*/ [] color = data.foreground;
+			double [] color = data.foreground;
 			if (data.fg != null) data.fg.release();
 			NSColor fg = data.fg = NSColor.colorWithDeviceRed(color[0], color[1], color[2], data.alpha / 255f);
 			fg.retain();
@@ -389,7 +389,7 @@ NSAutoreleasePool checkGC (int mask) {
 		if (pattern != null) {
 			if (pattern.color != null) pattern.color.setFill();
 		} else {
-			double /*float*/ [] color = data.foreground;
+			double [] color = data.foreground;
 			if (data.fg != null) data.fg.release();
 			NSColor fg = data.fg = NSColor.colorWithDeviceRed(color[0], color[1], color[2], data.alpha / 255f);
 			fg.retain();
@@ -402,7 +402,7 @@ NSAutoreleasePool checkGC (int mask) {
 		if (pattern != null) {
 			if (pattern.color != null) pattern.color.setFill();
 		} else {
-			double /*float*/ [] color = data.background;
+			double [] color = data.background;
 			if (data.bg != null) data.bg.release();
 			NSColor bg = data.bg = NSColor.colorWithDeviceRed(color[0], color[1], color[2], data.alpha / 255f);
 			bg.retain();
@@ -433,7 +433,7 @@ NSAutoreleasePool checkGC (int mask) {
 			case SWT.LINE_CUSTOM: dashes = data.lineDashes; break;
 		}
 		if (dashes != null) {
-			double /*float*/[] lengths = new double /*float*/[dashes.length];
+			double[] lengths = new double[dashes.length];
 			for (int i = 0; i < lengths.length; i++) {
 				lengths[i] = width == 0 || data.lineStyle == SWT.LINE_CUSTOM ? dashes[i] : dashes[i] * width;
 			}
@@ -470,9 +470,9 @@ NSAutoreleasePool checkGC (int mask) {
 		if (data.transform != null) {
 			size = data.transform.transformSize(size);
 		}
-		double /*float*/ scaling = size.width;
+		double scaling = size.width;
 		if (scaling < 0) scaling = -scaling;
-		double /*float*/ strokeWidth = data.lineWidth * scaling;
+		double strokeWidth = data.lineWidth * scaling;
 		if (strokeWidth == 0 || ((int)strokeWidth % 2) == 1) {
 			data.drawXOffset = 0.5f / scaling;
 		}
@@ -568,14 +568,14 @@ public void copyArea(Image image, int x, int y) {
 			rect.size.width = size.width;
 			rect.size.height = size.height;
 			int displayCount = 16;
-			long /*int*/ displays = C.malloc(4 * displayCount), countPtr = C.malloc(4);
+			long displays = C.malloc(4 * displayCount), countPtr = C.malloc(4);
 			if (OS.CGGetDisplaysWithRect(rect, displayCount, displays, countPtr) != 0) return;
 			int[] count = new int[1], display = new int[1];
 			C.memmove(count, countPtr, C.PTR_SIZEOF);
 			for (int i = 0; i < count[0]; i++) {
 				C.memmove(display, displays + (i * 4), 4);
 				OS.CGDisplayBounds(display[0], rect);
-				double /*float*/ scaling = 1;
+				double scaling = 1;
 				if (screens != null) {
 					for (int j = 0; j < screens.count(); j++) {
 						NSScreen screen = new NSScreen(screens.objectAtIndex(j));
@@ -597,7 +597,7 @@ public void copyArea(Image image, int x, int y) {
 					imageHandle.addRepresentation(rep);
 					rep.release();
 				}
-				long /*int*/ srcImage = 0;
+				long srcImage = 0;
 				srcImage = OS.CGDisplayCreateImage(display[0]);
 				if (srcImage != 0) {
 					copyArea(image, (int)(x * scaling - rect.origin.x), (int)(y * scaling - rect.origin.y), srcImage);
@@ -612,23 +612,23 @@ public void copyArea(Image image, int x, int y) {
 	}
 }
 
-void copyArea (Image image, int x, int y, long /*int*/ srcImage) {
+void copyArea (Image image, int x, int y, long srcImage) {
 	if (srcImage == 0) return;
 	NSBitmapImageRep rep = image.getRepresentation();
-	long /*int*/ bpc = rep.bitsPerSample();
-	long /*int*/ width = rep.pixelsWide();
-	long /*int*/ height = rep.pixelsHigh();
-	long /*int*/ bpr = rep.bytesPerRow();
-	long /*int*/ data = rep.bitmapData();
-	long /*int*/ format = rep.bitmapFormat();
+	long bpc = rep.bitsPerSample();
+	long width = rep.pixelsWide();
+	long height = rep.pixelsHigh();
+	long bpr = rep.bytesPerRow();
+	long data = rep.bitmapData();
+	long format = rep.bitmapFormat();
 	int alphaInfo;
 	if (rep.hasAlpha()) {
 		alphaInfo = (format & OS.NSAlphaFirstBitmapFormat) != 0 ? OS.kCGImageAlphaFirst : OS.kCGImageAlphaLast;
 	} else {
 		alphaInfo = (format & OS.NSAlphaFirstBitmapFormat) != 0 ? OS.kCGImageAlphaNoneSkipFirst : OS.kCGImageAlphaNoneSkipLast;
 	}
-	long /*int*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
-	long /*int*/ context = OS.CGBitmapContextCreate(data, width, height, bpc, bpr, colorspace, alphaInfo);
+	long colorspace = OS.CGColorSpaceCreateDeviceRGB();
+	long context = OS.CGBitmapContextCreate(data, width, height, bpc, bpr, colorspace, alphaInfo);
 	OS.CGColorSpaceRelease(colorspace);
 	if (context != 0) {
 	 	CGRect rect = new CGRect();
@@ -797,16 +797,16 @@ public void copyArea(int srcX, int srcY, int width, int height, int destX, int d
 	}
 }
 
-static long /*int*/ createCGPathRef(NSBezierPath nsPath) {
-	long /*int*/ count = nsPath.elementCount();
+static long createCGPathRef(NSBezierPath nsPath) {
+	long count = nsPath.elementCount();
 	if (count > 0) {
-		long /*int*/ cgPath = OS.CGPathCreateMutable();
+		long cgPath = OS.CGPathCreateMutable();
 		if (cgPath == 0) SWT.error(SWT.ERROR_NO_HANDLES);
-		long /*int*/ points = C.malloc(NSPoint.sizeof * 3);
+		long points = C.malloc(NSPoint.sizeof * 3);
 		if (points == 0) SWT.error(SWT.ERROR_NO_HANDLES);
-		double /*float*/ [] pt = new double /*float*/ [6];
+		double [] pt = new double [6];
 		for (int i = 0; i < count; i++) {
-			int element = (int)/*64*/nsPath.elementAtIndex(i, points);
+			int element = (int)nsPath.elementAtIndex(i, points);
 			switch (element) {
 				case OS.NSMoveToBezierPathElement:
 					C.memmove(pt, points, NSPoint.sizeof);
@@ -862,7 +862,7 @@ NSAttributedString createString(String string, int flags, boolean draw) {
 		} else {
 			NSColor fg = data.fg;
 			if (fg == null) {
-				double /*float*/ [] color = data.foreground;
+				double [] color = data.foreground;
 				fg = data.fg = NSColor.colorWithDeviceRed(color[0], color[1], color[2], data.alpha / 255f);
 				fg.retain();
 			}
@@ -907,16 +907,16 @@ NSAttributedString createString(String string, int flags, boolean draw) {
 	return attribStr;
 }
 
-NSBezierPath createNSBezierPath (long /*int*/  cgPath) {
+NSBezierPath createNSBezierPath (long  cgPath) {
 	Callback callback = new Callback(this, "applierFunc", 2);
-	long /*int*/  proc = callback.getAddress();
+	long  proc = callback.getAddress();
 	if (proc == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
 	count = typeCount = 0;
 	element = new CGPathElement();
 	OS.CGPathApply(cgPath, 0, proc);
 	types = new byte[typeCount];
-	points = new double /*float*/ [count];
-	point = new double /*float*/ [6];
+	points = new double [count];
+	point = new double [6];
 	count = typeCount = 0;
 	OS.CGPathApply(cgPath, 0, proc);
 	callback.dispose();
@@ -945,18 +945,18 @@ NSBezierPath createNSBezierPath (long /*int*/  cgPath) {
 				bezierPath.curveToPoint(nsPoint, nsPoint2, nsPoint3);
 				break;
 			case SWT.PATH_QUAD_TO:
-				double /*float*/ currentX = nsPoint.x;
-				double /*float*/ currentY = nsPoint.y;
+				double currentX = nsPoint.x;
+				double currentY = nsPoint.y;
 				nsPoint2.x = points[j++];
 				nsPoint2.y = points[j++];
 				nsPoint.x = points[j++];
 				nsPoint.y = points[j++];
-				double /*float*/ x0 = currentX;
-				double /*float*/ y0 = currentY;
-				double /*float*/ cx1 = x0 + 2 * (nsPoint2.x - x0) / 3;
-				double /*float*/ cy1 = y0 + 2 * (nsPoint2.y - y0) / 3;
-				double /*float*/ cx2 = cx1 + (nsPoint.x - x0) / 3;
-				double /*float*/ cy2 = cy1 + (nsPoint.y - y0) / 3;
+				double x0 = currentX;
+				double y0 = currentY;
+				double cx1 = x0 + 2 * (nsPoint2.x - x0) / 3;
+				double cy1 = y0 + 2 * (nsPoint2.y - y0) / 3;
+				double cx2 = cx1 + (nsPoint.x - x0) / 3;
+				double cy2 = cy1 + (nsPoint.y - y0) / 3;
 				nsPoint2.x = cx1;
 				nsPoint2.y = cy1;
 				nsPoint3.x = cx2;
@@ -1057,7 +1057,7 @@ public void drawArc(int x, int y, int width, int height, int startAngle, int arc
 	try {
 		handle.saveGraphicsState();
 		NSAffineTransform transform = NSAffineTransform.transform();
-		double /*float*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
+		double xOffset = data.drawXOffset, yOffset = data.drawYOffset;
 		transform.translateXBy(x + xOffset + width / 2f, y + yOffset + height / 2f);
 		transform.scaleXBy(width / 2f, height / 2f);
 		NSBezierPath path = data.path;
@@ -1428,7 +1428,7 @@ public void drawPolygon(int[] pointArray) {
 	if (pointArray.length < 4) return;
 	NSAutoreleasePool pool = checkGC(DRAW);
 	try {
-		double /*float*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
+		double xOffset = data.drawXOffset, yOffset = data.drawYOffset;
 		NSBezierPath path = data.path;
 		NSPoint pt = new NSPoint();
 		pt.x = pointArray[0] + xOffset;
@@ -1477,7 +1477,7 @@ public void drawPolyline(int[] pointArray) {
 	if (pointArray.length < 4) return;
 	NSAutoreleasePool pool = checkGC(DRAW);
 	try {
-		double /*float*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
+		double xOffset = data.drawXOffset, yOffset = data.drawYOffset;
 		NSBezierPath path = data.path;
 		NSPoint pt = new NSPoint();
 		pt.x = pointArray[0] + xOffset;
@@ -1814,7 +1814,7 @@ private void doDrawText(String string, int x, int y, int flags) {
 		} else {
 			NSColor bg = data.bg;
 			if (bg == null) {
-				double /*float*/ [] color = data.background;
+				double [] color = data.background;
 				bg = data.bg = NSColor.colorWithDeviceRed(color[0], color[1], color[2], data.alpha / 255f);
 				bg.retain();
 			}
@@ -1889,7 +1889,7 @@ public void fillArc(int x, int y, int width, int height, int startAngle, int arc
 	try {
 		handle.saveGraphicsState();
 		NSAffineTransform transform = NSAffineTransform.transform();
-		double /*float*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
+		double xOffset = data.drawXOffset, yOffset = data.drawYOffset;
 		transform.translateXBy(x + xOffset + width / 2f, y + yOffset + height / 2f);
 		transform.scaleXBy(width / 2f, height / 2f);
 		NSBezierPath path = data.path;
@@ -2036,16 +2036,16 @@ void fillPattern(NSBezierPath path, Pattern pattern) {
 	NSPoint end = new NSPoint();
 	end.x = pattern.pt2.x;
 	end.y = pattern.pt2.y;
-	double /*float*/ difx = end.x - start.x;
-	double /*float*/ dify = end.y - start.y;
+	double difx = end.x - start.x;
+	double dify = end.y - start.y;
 	if (difx == 0 && dify == 0) {
-		double /*float*/ [] color = pattern.color1;
+		double [] color = pattern.color1;
 		NSColor.colorWithDeviceRed(color[0], color[1], color[2], data.alpha / 255f).setFill();
 		path.fill();
 		handle.restoreGraphicsState();
 		return;
 	}
-	double /*float*/ startx, starty, endx, endy;
+	double startx, starty, endx, endy;
 	if (difx == 0 || dify == 0) {
 		startx = bounds.x;
 		starty = bounds.y;
@@ -2058,13 +2058,13 @@ void fillPattern(NSBezierPath path, Pattern pattern) {
 			endy = bounds.y;
 		}
 	} else {
-		double /*float*/ m = (end.y-start.y)/(end.x - start.x);
-		double /*float*/ b = end.y - (m * end.x);
-		double /*float*/ m2 = -1/m; //perpendicular slope
-		double /*float*/ b2 = bounds.y - (m2 * bounds.x);
+		double m = (end.y-start.y)/(end.x - start.x);
+		double b = end.y - (m * end.x);
+		double m2 = -1/m; //perpendicular slope
+		double b2 = bounds.y - (m2 * bounds.x);
 		startx = endx = (b - b2) / (m2 - m);
 		b2 = (bounds.y + bounds.height) - (m2 * bounds.x);
-		double /*float*/ x2 = (b - b2) / (m2 - m);
+		double x2 = (b - b2) / (m2 - m);
 		startx = difx > 0 ? Math.min(startx, x2) : Math.max(startx, x2);
 		endx = difx < 0 ? Math.min(endx, x2) : Math.max(endx, x2);
 		b2 = bounds.y - (m2 * (bounds.x + bounds.width));
@@ -2314,8 +2314,8 @@ public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth
 
 void strokePattern(NSBezierPath path, Pattern pattern) {
 	handle.saveGraphicsState();
-	long /*int*/ cgPath = createCGPathRef(path);
-	long /*int*/ cgContext = handle.graphicsPort();
+	long cgPath = createCGPathRef(path);
+	long cgContext = handle.graphicsPort();
 	OS.CGContextSaveGState(cgContext);
 	initCGContext(cgContext);
 	OS.CGContextAddPath(cgContext, cgPath);
@@ -2584,15 +2584,15 @@ public void getClipping(Region region) {
 		}
 		if (data.clipPath != null) {
 			NSBezierPath clip = data.clipPath.bezierPathByFlatteningPath();
-			int count = (int)/*64*/clip.elementCount();
+			int count = (int)clip.elementCount();
 			int pointCount = 0;
 			Region clipRgn = new Region(device);
 			int[] pointArray = new int[count * 2];
-			long /*int*/ points = C.malloc(NSPoint.sizeof);
+			long points = C.malloc(NSPoint.sizeof);
 			if (points == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 			NSPoint pt = new NSPoint();
 			for (int i = 0; i < count; i++) {
-				int element = (int)/*64*/clip.elementAtIndex(i, points);
+				int element = (int)clip.elementAtIndex(i, points);
 				switch (element) {
 					case OS.NSMoveToBezierPathElement:
 						if (pointCount != 0) clipRgn.add(pointArray, pointCount);
@@ -2775,7 +2775,7 @@ public GCData getGCData() {
  */
 public int getInterpolation() {
 	if (handle == null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-	int interpolation = (int)/*64*/handle.imageInterpolation();
+	int interpolation = (int)handle.imageInterpolation();
 	switch (interpolation) {
 		case OS.NSImageInterpolationDefault: return SWT.DEFAULT;
 		case OS.NSImageInterpolationNone: return SWT.NONE;
@@ -3029,10 +3029,10 @@ public boolean getXORMode() {
  */
 @Override
 public int hashCode() {
-	return handle != null ? (int)/*64*/handle.id : 0;
+	return handle != null ? (int)handle.id : 0;
 }
 
-void init(Drawable drawable, GCData data, long /*int*/ context) {
+void init(Drawable drawable, GCData data, long context) {
 	if (data.foreground != null) data.state &= ~(FOREGROUND | FOREGROUND_FILL);
 	if (data.background != null)  data.state &= ~BACKGROUND;
 	if (data.font != null) data.state &= ~FONT;
@@ -3050,7 +3050,7 @@ void init(Drawable drawable, GCData data, long /*int*/ context) {
 	data.path.retain();
 }
 
-void initCGContext(long /*int*/ cgContext) {
+void initCGContext(long cgContext) {
 	int state = data.state;
 	if ((state & LINE_WIDTH) != 0) {
 		OS.CGContextSetLineWidth(cgContext, data.lineWidth == 0 ?  1 : data.lineWidth);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java
index 223dd55154..be16852538 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java
@@ -33,7 +33,7 @@ public final class GCData {
 	public Device device;
 	public int style, state = -1;
 
-	public double /*float*/ [] foreground, background;
+	public double [] foreground, background;
 	public Pattern foregroundPattern;
 	public Pattern backgroundPattern;
 	public Font font;
@@ -55,12 +55,12 @@ public final class GCData {
 	public NSLayoutManager layoutManager;
 	public NSTextContainer textContainer;
 	public NSColor fg, bg;
-	public double /*float*/ drawXOffset, drawYOffset;
+	public double drawXOffset, drawYOffset;
 	public NSRect paintRect;
 	public NSBezierPath path;
 	public NSAffineTransform transform, inverseTransform;
 	public NSBezierPath clipPath, visiblePath;
-	public long /*int*/ visibleRgn;
+	public long visibleRgn;
 	public NSView view;
 	public NSSize size;
 	public Thread thread;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java
index f426f91c28..119c7a1418 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java
@@ -166,8 +166,8 @@ public final class Image extends Resource implements Drawable {
 		}
 
 		void init(NSImageRep nativeRep, NSBitmapImageRep rep) {
-			int width = (int)/*64*/nativeRep.pixelsWide();
-			int height = (int)/*64*/nativeRep.pixelsHigh();
+			int width = (int)nativeRep.pixelsWide();
+			int height = (int)nativeRep.pixelsHigh();
 
 			boolean hasAlpha = rep.hasAlpha();
 			int bpr = width * 4;
@@ -176,8 +176,8 @@ public final class Image extends Resource implements Drawable {
 			rect.height = height;
 
 			/* Compute the pixels */
-			long /*int*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
-			long /*int*/ ctx = OS.CGBitmapContextCreate(rep.bitmapData(), width, height, 8, bpr, colorspace, OS.kCGImageAlphaNoneSkipFirst);
+			long colorspace = OS.CGColorSpaceCreateDeviceRGB();
+			long ctx = OS.CGBitmapContextCreate(rep.bitmapData(), width, height, 8, bpr, colorspace, OS.kCGImageAlphaNoneSkipFirst);
 			OS.CGColorSpaceRelease(colorspace);
 			NSGraphicsContext.static_saveGraphicsState();
 			NSGraphicsContext.setCurrentContext(NSGraphicsContext.graphicsContextWithGraphicsPort(ctx, false));
@@ -187,15 +187,15 @@ public final class Image extends Resource implements Drawable {
 
 			if (hasAlpha) {
 				/* Compute the alpha values */
-				long /*int*/ bitmapBytesPerRow = width;
-				long /*int*/ bitmapByteCount = bitmapBytesPerRow * height;
-				long /*int*/ alphaBitmapData = C.malloc(bitmapByteCount);
-				long /*int*/ alphaBitmapCtx = OS.CGBitmapContextCreate(alphaBitmapData, width, height, 8, bitmapBytesPerRow, 0, OS.kCGImageAlphaOnly);
+				long bitmapBytesPerRow = width;
+				long bitmapByteCount = bitmapBytesPerRow * height;
+				long alphaBitmapData = C.malloc(bitmapByteCount);
+				long alphaBitmapCtx = OS.CGBitmapContextCreate(alphaBitmapData, width, height, 8, bitmapBytesPerRow, 0, OS.kCGImageAlphaOnly);
 				NSGraphicsContext.static_saveGraphicsState();
 				NSGraphicsContext.setCurrentContext(NSGraphicsContext.graphicsContextWithGraphicsPort(alphaBitmapCtx, false));
 				nativeRep.drawInRect(rect);
 				NSGraphicsContext.static_restoreGraphicsState();
-				byte[] alphaData = new byte[(int)/*64*/bitmapByteCount];
+				byte[] alphaData = new byte[(int)bitmapByteCount];
 				C.memmove(alphaData, alphaBitmapData, bitmapByteCount);
 				C.free(alphaBitmapData);
 				OS.CGContextRelease(alphaBitmapCtx);
@@ -405,17 +405,17 @@ private void copyAlphaInfo(AlphaInfo src_alphaInfo, AlphaInfo dest_alphaInfo) {
  * Applies the flag to the newly created representation. This method is invoked from the Image copy constructor.
  */
 private void createRepFromSourceAndApplyFlag(NSBitmapImageRep srcRep, int srcWidth, int srcHeight, int flag) {
-	long /*int*/ srcData = srcRep.bitmapData();
-	long /*int*/ srcBitmapFormat = srcRep.bitmapFormat();
-	long /*int*/ srcBpp = srcRep.bitsPerPixel();
-	long /*int*/ srcBpr = srcRep.bytesPerRow();
+	long srcData = srcRep.bitmapData();
+	long srcBitmapFormat = srcRep.bitmapFormat();
+	long srcBpp = srcRep.bitsPerPixel();
+	long srcBpr = srcRep.bytesPerRow();
 
 	NSBitmapImageRep rep = (NSBitmapImageRep)new NSBitmapImageRep().alloc();
 	rep = rep.initWithBitmapDataPlanes(0, srcWidth, srcHeight, srcRep.bitsPerSample(), srcRep.samplesPerPixel(), srcRep.hasAlpha(), srcRep.isPlanar(), OS.NSDeviceRGBColorSpace, srcBitmapFormat, srcRep.bytesPerRow(), srcBpp);
 	handle.addRepresentation(rep);
 	rep.release();
 
-	long /*int*/ data = rep.bitmapData();
+	long data = rep.bitmapData();
 	C.memmove(data, srcData, srcWidth * srcHeight * 4);
 	if (flag != SWT.IMAGE_COPY) {
 		final int redOffset, greenOffset, blueOffset;
@@ -441,7 +441,7 @@ private void createRepFromSourceAndApplyFlag(NSBitmapImageRep srcRep, int srcWid
 			byte oneRed = (byte)oneRGB.red;
 			byte oneGreen = (byte)oneRGB.green;
 			byte oneBlue = (byte)oneRGB.blue;
-			byte[] line = new byte[(int)/*64*/srcBpr];
+			byte[] line = new byte[(int)srcBpr];
 			for (int y=0; y<srcHeight; y++) {
 				C.memmove(line, data + (y * srcBpr), srcBpr);
 				int offset = 0;
@@ -466,7 +466,7 @@ private void createRepFromSourceAndApplyFlag(NSBitmapImageRep srcRep, int srcWid
 			break;
 		}
 		case SWT.IMAGE_GRAY: {
-			byte[] line = new byte[(int)/*64*/srcBpr];
+			byte[] line = new byte[(int)srcBpr];
 			for (int y=0; y<srcHeight; y++) {
 				C.memmove(line, data + (y * srcBpr), srcBpr);
 				int offset = 0;
@@ -847,14 +847,14 @@ private AlphaInfo _getAlphaInfoAtCurrentZoom (NSBitmapImageRep rep) {
 }
 
 ImageData _getImageData (NSBitmapImageRep imageRep, AlphaInfo info) {
-	long /*int*/ width = imageRep.pixelsWide();
-	long /*int*/ height = imageRep.pixelsHigh();
-	long /*int*/ bpr = imageRep.bytesPerRow();
-	long /*int*/ bpp = imageRep.bitsPerPixel();
-	long /*int*/ bitmapData = imageRep.bitmapData();
-	long /*int*/ bitmapFormat = imageRep.bitmapFormat();
-	long /*int*/ dataSize = height * bpr;
-	byte[] srcData = new byte[(int)/*64*/dataSize];
+	long width = imageRep.pixelsWide();
+	long height = imageRep.pixelsHigh();
+	long bpr = imageRep.bytesPerRow();
+	long bpp = imageRep.bitsPerPixel();
+	long bitmapData = imageRep.bitmapData();
+	long bitmapFormat = imageRep.bitmapFormat();
+	long dataSize = height * bpr;
+	byte[] srcData = new byte[(int)dataSize];
 	C.memmove(srcData, bitmapData, dataSize);
 
 	PaletteData palette;
@@ -863,8 +863,8 @@ ImageData _getImageData (NSBitmapImageRep imageRep, AlphaInfo info) {
 	} else {
 		palette = new PaletteData(0xFF0000, 0xFF00, 0xFF);
 	}
-	ImageData data = new ImageData((int)/*64*/width, (int)/*64*/height, (int)/*64*/bpp, palette, 1, srcData);
-	data.bytesPerLine = (int)/*64*/bpr;
+	ImageData data = new ImageData((int)width, (int)height, (int)bpp, palette, 1, srcData);
+	data.bytesPerLine = (int)bpr;
 	if (imageRep.hasAlpha() && info.transparentPixel == -1 && info.alpha == -1 && info.alphaData == null) {
 		byte[] alphaD = new byte[(int) (dataSize/4)];
 		int offset = (bitmapFormat & OS.NSAlphaFirstBitmapFormat) != 0 ? 0 : 3, a = 0;
@@ -877,8 +877,8 @@ ImageData _getImageData (NSBitmapImageRep imageRep, AlphaInfo info) {
 		if (info.transparentPixel == -1 && type == SWT.ICON) {
 			/* Get the icon mask data */
 			int maskPad = 2;
-			long /*int*/ maskBpl = (((width + 7) / 8) + (maskPad - 1)) / maskPad * maskPad;
-			byte[] maskData = new byte[(int)/*64*/(height * maskBpl)];
+			long maskBpl = (((width + 7) / 8) + (maskPad - 1)) / maskPad * maskPad;
+			byte[] maskData = new byte[(int)(height * maskBpl)];
 			int offset = 0, maskOffset = 0;
 			for (int y = 0; y<height; y++) {
 				for (int x = 0; x<width; x++) {
@@ -940,12 +940,12 @@ void createAlpha () {
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
 		NSBitmapImageRep imageRep = getRepresentation();
-		long /*int*/ height = imageRep.pixelsHigh();
-		long /*int*/ bpr = imageRep.bytesPerRow();
-		long /*int*/ bitmapData = imageRep.bitmapData();
-		long /*int*/ format = imageRep.bitmapFormat();
-		long /*int*/ dataSize = height * bpr;
-		byte[] srcData = new byte[(int)/*64*/dataSize];
+		long height = imageRep.pixelsHigh();
+		long bpr = imageRep.bytesPerRow();
+		long bitmapData = imageRep.bitmapData();
+		long format = imageRep.bitmapFormat();
+		long dataSize = height * bpr;
+		byte[] srcData = new byte[(int)dataSize];
 		C.memmove(srcData, bitmapData, dataSize);
 		if (info.transparentPixel != -1) {
 			if ((format & OS.NSAlphaFirstBitmapFormat) != 0) {
@@ -965,7 +965,7 @@ void createAlpha () {
 				srcData[i] = a;
 			}
 		} else {
-			long /*int*/ width = imageRep.pixelsWide();
+			long width = imageRep.pixelsWide();
 			int offset = 0, alphaOffset = (format & OS.NSAlphaFirstBitmapFormat) != 0 ? 0 : 3;
 			for (int y = 0; y<height; y++) {
 				for (int x = 0; x<width && alphaOffset<info.alphaData.length && offset<srcData.length; x++) {
@@ -1127,7 +1127,7 @@ public boolean equals (Object object) {
 NSBitmapImageRep getRepresentation_100 () {
 	NSArray reps = handle.representations();
 	NSSize size = handle.size();
-	long /*int*/ count = reps.count();
+	long count = reps.count();
 	for (int i = 0; i < count; i++) {
 		NSBitmapImageRep rep = new NSBitmapImageRep(reps.objectAtIndex(i));
 		if (((int)size.width == rep.pixelsWide() && (int)size.height == rep.pixelsHigh())) {
@@ -1150,7 +1150,7 @@ NSBitmapImageRep getRepresentation_100 () {
 NSBitmapImageRep getRepresentation_200 () {
 	NSArray reps = handle.representations();
 	NSSize size = handle.size();
-	long /*int*/ count = reps.count();
+	long count = reps.count();
 	for (int i = 0; i < count; i++) {
 		NSBitmapImageRep rep = new NSBitmapImageRep(reps.objectAtIndex(i));
 		int width = (int)size.width * 2;
@@ -1190,7 +1190,7 @@ public Color getBackground() {
 	int red = (alphaInfo.transparentPixel >> 16) & 0xFF;
 	int green = (alphaInfo.transparentPixel >> 8) & 0xFF;
 	int blue = (alphaInfo.transparentPixel >> 0) & 0xFF;
-	return Color.cocoa_new(device, new double /*float*/ []{red / 255f, green / 255f, blue / 255f, 1});
+	return Color.cocoa_new(device, new double []{red / 255f, green / 255f, blue / 255f, 1});
 }
 
 /**
@@ -1337,7 +1337,7 @@ public ImageData getImageData(int zoom) {
 					}
 
 					NSArray reps = handle.representations();
-					long /*int*/ count = reps.count();
+					long count = reps.count();
 					for (int i = 0; i < count; i++) {
 						handle.removeRepresentation(new NSImageRep(handle.representations().objectAtIndex(0)));
 					}
@@ -1389,7 +1389,7 @@ NSBitmapImageRep getRepresentation () {
 	}
 	NSArray reps = handle.representations();
 	NSSize size = handle.size();
-	long /*int*/ count = reps.count();
+	long count = reps.count();
 	NSBitmapImageRep bestRep = null;
 	for (int i = 0; i < count; i++) {
 		rep = new NSBitmapImageRep(reps.objectAtIndex(i));
@@ -1429,7 +1429,7 @@ public int hashCode () {
 	} else if (imageFileNameProvider != null) {
 		return imageFileNameProvider.hashCode();
 	} else {
-		return handle != null ? (int)/*64*/handle.id : 0;
+		return handle != null ? (int)handle.id : 0;
 	}
 }
 
@@ -1478,8 +1478,8 @@ void initAlpha_200(NSBitmapImageRep nativeRep) {
 	NSAutoreleasePool pool = null;
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
-		int width = (int)/*64*/nativeRep.pixelsWide();
-		int height = (int)/*64*/nativeRep.pixelsHigh();
+		int width = (int)nativeRep.pixelsWide();
+		int height = (int)nativeRep.pixelsHigh();
 
 		boolean hasAlpha = nativeRep.hasAlpha();
 		int bpr = width * 4;
@@ -1517,8 +1517,8 @@ void initNative(String filename) {
 		if (!nativeRep.isKindOfClass(OS.class_NSBitmapImageRep)) {
 			return;
 		}
-		width = (int)/*64*/nativeRep.pixelsWide();
-		height = (int)/*64*/nativeRep.pixelsHigh();
+		width = (int)nativeRep.pixelsWide();
+		height = (int)nativeRep.pixelsHigh();
 
 		boolean hasAlpha = nativeRep.hasAlpha();
 		int bpr = width * 4;
@@ -1565,7 +1565,7 @@ void initNative(String filename) {
  * @noreference This method is not intended to be referenced by clients.
  */
 @Override
-public long /*int*/ internal_new_GC (GCData data) {
+public long internal_new_GC (GCData data) {
 	if (handle == null) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	if (type != SWT.BITMAP || memGC != null) {
 		SWT.error(SWT.ERROR_INVALID_ARGUMENT);
@@ -1624,8 +1624,8 @@ public long /*int*/ internal_new_GC (GCData data) {
  * @noreference This method is not intended to be referenced by clients.
  */
 @Override
-public void internal_dispose_GC (long /*int*/ hDC, GCData data) {
-	long /*int*/ context = hDC;
+public void internal_dispose_GC (long hDC, GCData data) {
+	long context = hDC;
 	NSAutoreleasePool pool = null;
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
@@ -1713,10 +1713,10 @@ public void setBackground(Color color) {
 		byte newGreen = (byte)((int)(color.handle[1] * 255) & 0xFF);
 		byte newBlue = (byte)((int)(color.handle[2] * 255) & 0xFF);
 		long height = imageRep.pixelsHigh();
-		long /*int*/ bpr = imageRep.bytesPerRow();
-		long /*int*/ data = imageRep.bitmapData();
-		long /*int*/ format = imageRep.bitmapFormat();
-		long /*int*/ bpp = imageRep.bitsPerPixel();
+		long bpr = imageRep.bytesPerRow();
+		long data = imageRep.bitmapData();
+		long format = imageRep.bitmapFormat();
+		long bpp = imageRep.bitsPerPixel();
 		final int redOffset, greenOffset, blueOffset;
 		if (bpp == 32 && (format & OS.NSAlphaFirstBitmapFormat) == 0) {
 			redOffset = 0;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java
index a7daa3b8f1..0f99be1d91 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java
@@ -141,7 +141,7 @@ public Path (Device device, Path path, float flatness) {
 		if (flatness == 0) {
 			handle = new NSBezierPath(path.handle.copy().id);
 		} else {
-			double /*float*/ defaultFlatness = NSBezierPath.defaultFlatness();
+			double defaultFlatness = NSBezierPath.defaultFlatness();
 			NSBezierPath.setDefaultFlatness(flatness);
 			handle = path.handle.bezierPathByFlatteningPath();
 			handle.retain();
@@ -248,14 +248,14 @@ public void addArc(float x, float y, float width, float height, float startAngle
 }
 
 void appendBezierPath (NSBezierPath path) {
-	int count = (int)/*64*/path.elementCount();
-	long /*int*/ points = C.malloc(3 * NSPoint.sizeof);
+	int count = (int)path.elementCount();
+	long points = C.malloc(3 * NSPoint.sizeof);
 	if (points == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 	NSPoint pt1 = new NSPoint();
 	NSPoint pt2 = new NSPoint();
 	NSPoint pt3 = new NSPoint();
 	for (int i = 0; i < count; i++) {
-		int element = (int)/*64*/path.elementAtIndex(i, points);
+		int element = (int)path.elementAtIndex(i, points);
 		switch (element) {
 			case OS.NSMoveToBezierPathElement:
 				OS.memmove(pt1, points, NSPoint.sizeof);
@@ -396,8 +396,8 @@ public void addString(String string, float x, float y, Font font) {
 		attrStr.release();
 		range = layoutManager.glyphRangeForTextContainer(textContainer);
 		if (range.length != 0) {
-			long /*int*/ glyphs = C.malloc((range.length + 1) * 4);
-			long /*int*/ count = layoutManager.getGlyphs(glyphs, range);
+			long glyphs = C.malloc((range.length + 1) * 4);
+			long count = layoutManager.getGlyphs(glyphs, range);
 			NSBezierPath path = NSBezierPath.bezierPath();
 			for (int i = 0; i < count; i++) {
 				NSPoint pt = layoutManager.locationForGlyphAtIndex(i);
@@ -475,12 +475,12 @@ public boolean contains(float x, float y, GC gc, boolean outline) {
 	try {
 		//TODO - see windows
 		if (outline) {
-			long /*int*/ pixel = C.malloc(4);
+			long pixel = C.malloc(4);
 			if (pixel == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 			int[] buffer = new int[]{0xFFFFFFFF};
 			C.memmove(pixel, buffer, 4);
-			long /*int*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
-			long /*int*/ context = OS.CGBitmapContextCreate(pixel, 1, 1, 8, 4, colorspace, OS.kCGImageAlphaNoneSkipFirst);
+			long colorspace = OS.CGColorSpaceCreateDeviceRGB();
+			long context = OS.CGBitmapContextCreate(pixel, 1, 1, 8, 4, colorspace, OS.kCGImageAlphaNoneSkipFirst);
 			OS.CGColorSpaceRelease(colorspace);
 			if (context == 0) {
 				C.free(pixel);
@@ -503,7 +503,7 @@ public boolean contains(float x, float y, GC gc, boolean outline) {
 			OS.CGContextSetLineJoin(context, joinStyle);
 			OS.CGContextSetLineWidth(context, data.lineWidth);
 			OS.CGContextTranslateCTM(context, -x + 0.5f, -y + 0.5f);
-			long /*int*/ path = GC.createCGPathRef(handle);
+			long path = GC.createCGPathRef(handle);
 			OS.CGContextAddPath(context, path);
 			OS.CGPathRelease(path);
 			OS.CGContextStrokePath(context);
@@ -586,10 +586,10 @@ public void getBounds(float[] bounds) {
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
 		NSRect rect = handle.controlPointBounds();
-		bounds[0] = (float)/*64*/rect.x;
-		bounds[1] = (float)/*64*/rect.y;
-		bounds[2] = (float)/*64*/rect.width;
-		bounds[3] = (float)/*64*/rect.height;
+		bounds[0] = (float)rect.x;
+		bounds[1] = (float)rect.y;
+		bounds[2] = (float)rect.width;
+		bounds[3] = (float)rect.height;
 	} finally {
 		if (pool != null) pool.release();
 	}
@@ -617,8 +617,8 @@ public void getCurrentPoint(float[] point) {
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
 		NSPoint pt = handle.currentPoint();
-		point[0] = (float)/*64*/pt.x;
-		point[1] = (float)/*64*/pt.y;
+		point[0] = (float)pt.x;
+		point[1] = (float)pt.y;
 	} finally {
 		if (pool != null) pool.release();
 	}
@@ -640,15 +640,15 @@ public PathData getPathData() {
 	NSAutoreleasePool pool = null;
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
-		int count = (int)/*64*/handle.elementCount();
+		int count = (int)handle.elementCount();
 		int pointCount = 0, typeCount = 0;
 		byte[] types = new byte[count];
 		float[] pointArray = new float[count * 6];
-		long /*int*/ points = C.malloc(3 * NSPoint.sizeof);
+		long points = C.malloc(3 * NSPoint.sizeof);
 		if (points == 0) SWT.error(SWT.ERROR_NO_HANDLES);
 		NSPoint pt = new NSPoint();
 		for (int i = 0; i < count; i++) {
-			int element = (int)/*64*/handle.elementAtIndex(i, points);
+			int element = (int)handle.elementAtIndex(i, points);
 			switch (element) {
 				case OS.NSMoveToBezierPathElement:
 					types[typeCount++] = SWT.PATH_MOVE_TO;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Pattern.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Pattern.java
index bbe6599df3..bffd556d1b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Pattern.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Pattern.java
@@ -40,7 +40,7 @@ public class Pattern extends Resource {
 	NSGradient gradient;
 	NSPoint pt1, pt2;
 	Image image;
-	double /*float*/ [] color1, color2;
+	double [] color1, color2;
 	int alpha1, alpha2;
 
 /**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java
index e9e2dae796..b4b30d3ab6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java
@@ -44,7 +44,7 @@ public final class Region extends Resource {
 	 *
 	 * @noreference This field is not intended to be referenced by clients.
 	 */
-	public long /*int*/ handle;
+	public long handle;
 
 /**
  * Constructs a new empty region.
@@ -94,7 +94,7 @@ public Region(Device device) {
 	}
 }
 
-Region(Device device, long /*int*/ handle) {
+Region(Device device, long handle) {
 	super(device);
 	this.handle = handle;
 }
@@ -115,13 +115,13 @@ Region(Device device, long /*int*/ handle) {
  *
  * @noreference This method is not intended to be referenced by clients.
  */
-public static Region cocoa_new(Device device, long /*int*/ handle) {
+public static Region cocoa_new(Device device, long handle) {
 	return new Region(device, handle);
 }
 
-static long /*int*/ polyToRgn(int[] poly, int length) {
+static long polyToRgn(int[] poly, int length) {
 	short[] r = new short[4];
-	long /*int*/ polyRgn = OS.NewRgn(), rectRgn = OS.NewRgn();
+	long polyRgn = OS.NewRgn(), rectRgn = OS.NewRgn();
 	int minY = poly[1], maxY = poly[1];
 	for (int y = 3; y < length; y += 2) {
 		if (poly[y] < minY) minY = poly[y];
@@ -164,11 +164,11 @@ static long /*int*/ polyToRgn(int[] poly, int length) {
 	return polyRgn;
 }
 
-static long /*int*/ polyRgn(int[] pointArray, int count) {
+static long polyRgn(int[] pointArray, int count) {
 	NSAutoreleasePool pool = null;
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
-		long /*int*/ polyRgn;
+		long polyRgn;
 		if (C.PTR_SIZEOF == 4) {
 			polyRgn = OS.NewRgn();
 			OS.OpenRgn();
@@ -221,7 +221,7 @@ void add(int[] pointArray, int count) {
 	NSAutoreleasePool pool = null;
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
-		long /*int*/ polyRgn = polyRgn(pointArray, count);
+		long polyRgn = polyRgn(pointArray, count);
 		OS.UnionRgn(handle, polyRgn, handle);
 		OS.DisposeRgn(polyRgn);
 	} finally {
@@ -280,7 +280,7 @@ public void add(int x, int y, int width, int height) {
 	NSAutoreleasePool pool = null;
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
-		long /*int*/ rectRgn = OS.NewRgn();
+		long rectRgn = OS.NewRgn();
 		short[] r = new short[4];
 		OS.SetRect(r, (short)x, (short)y, (short)(x + width),(short)(y + height));
 		OS.RectRgn(rectRgn, r);
@@ -366,9 +366,9 @@ public boolean contains(Point pt) {
 
 NSAffineTransform transform;
 void convertRgn(NSAffineTransform transform) {
-	long /*int*/ newRgn = OS.NewRgn();
+	long newRgn = OS.NewRgn();
 	Callback callback = new Callback(this, "convertRgn", 4);
-	long /*int*/ proc = callback.getAddress();
+	long proc = callback.getAddress();
 	if (proc == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
 	this.transform = transform;
 	OS.QDRegionToRects(handle, OS.kQDParseRegionFromTopLeft, proc, newRgn);
@@ -378,7 +378,7 @@ void convertRgn(NSAffineTransform transform) {
 	OS.DisposeRgn(newRgn);
 }
 
-long /*int*/ convertRgn(long /*int*/ message, long /*int*/ rgn, long /*int*/ r, long /*int*/ newRgn) {
+long convertRgn(long message, long rgn, long r, long newRgn) {
 	if (message == OS.kQDRegionToRectsMsgParse) {
 		short[] rect = new short[4];
 		C.memmove(rect, r, rect.length * 2);
@@ -408,7 +408,7 @@ long /*int*/ convertRgn(long /*int*/ message, long /*int*/ rgn, long /*int*/ r,
 		points[i++] = (short)Math.round(point.y);
 		points[i++] = startX;
 		points[i++] = startY;
-		long /*int*/ polyRgn = polyRgn(points, points.length);
+		long polyRgn = polyRgn(points, points.length);
 		OS.UnionRgn(newRgn, polyRgn, newRgn);
 		OS.DisposeRgn(polyRgn);
 	}
@@ -480,7 +480,7 @@ NSBezierPath getPath() {
 
 NSPoint pt = new NSPoint();
 short[] rect = new short[4];
-long /*int*/ regionToRects(long /*int*/ message, long /*int*/ rgn, long /*int*/ r, long /*int*/ path) {
+long regionToRects(long message, long rgn, long r, long path) {
 	if (message == OS.kQDRegionToRectsMsgParse) {
 		C.memmove(rect, r, rect.length * 2);
 		pt.x = rect[1];
@@ -510,7 +510,7 @@ long /*int*/ regionToRects(long /*int*/ message, long /*int*/ rgn, long /*int*/
  */
 @Override
 public int hashCode() {
-	return (int)/*64*/handle;
+	return (int)handle;
 }
 
 /**
@@ -559,7 +559,7 @@ public void intersect(int x, int y, int width, int height) {
 	NSAutoreleasePool pool = null;
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
-		long /*int*/ rectRgn = OS.NewRgn();
+		long rectRgn = OS.NewRgn();
 		short[] r = new short[4];
 		OS.SetRect(r, (short)x, (short)y, (short)(x + width),(short)(y + height));
 		OS.RectRgn(rectRgn, r);
@@ -711,7 +711,7 @@ public void subtract (int[] pointArray) {
 	NSAutoreleasePool pool = null;
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
-		long /*int*/ polyRgn = polyRgn(pointArray, pointArray.length);
+		long polyRgn = polyRgn(pointArray, pointArray.length);
 		OS.DiffRgn(handle, polyRgn, handle);
 		OS.DisposeRgn(polyRgn);
 	} finally {
@@ -765,7 +765,7 @@ public void subtract(int x, int y, int width, int height) {
 	NSAutoreleasePool pool = null;
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
-		long /*int*/ rectRgn = OS.NewRgn();
+		long rectRgn = OS.NewRgn();
 		short[] r = new short[4];
 		OS.SetRect(r, (short)x, (short)y, (short)(x + width),(short)(y + height));
 		OS.RectRgn(rectRgn, r);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java
index fd140d8e7e..0d5190b29c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java
@@ -72,7 +72,7 @@ public final class TextLayout extends Resource {
 	static class StyleItem {
 		TextStyle style;
 		int start;
-		long /*int*/ jniRef;
+		long jniRef;
 		NSCell cell;
 		@Override
 		public String toString () {
@@ -222,7 +222,7 @@ void computeRuns() {
 	}
 	attrStr.addAttribute(OS.NSParagraphStyleAttributeName, paragraph, range);
 	paragraph.release();
-	long /*int*/ textLength = attrStr.length();
+	long textLength = attrStr.length();
 	for (int i = 0; i < stylesCount - 1; i++) {
 		StyleItem run = styles[i];
 		if (run.style == null) continue;
@@ -331,8 +331,8 @@ void computeRuns() {
 
 	int numberOfLines;
 	layoutManager.glyphRangeForTextContainer(textContainer);
-	long /*int*/ numberOfGlyphs = layoutManager.numberOfGlyphs(), index;
-	long /*int*/ rangePtr = C.malloc(NSRange.sizeof);
+	long numberOfGlyphs = layoutManager.numberOfGlyphs(), index;
+	long rangePtr = C.malloc(NSRange.sizeof);
 	NSRange lineRange = new NSRange();
 	for (numberOfLines = 0, index = 0; index < numberOfGlyphs; numberOfLines++){
 	    layoutManager.lineFragmentUsedRectForGlyphAtIndex(index, rangePtr, true);
@@ -346,7 +346,7 @@ void computeRuns() {
 		bounds[numberOfLines] = layoutManager.lineFragmentUsedRectForGlyphAtIndex(index, rangePtr, true);
 		if (numberOfLines < bounds.length - 1) bounds[numberOfLines].height -= spacing;
 	    OS.memmove(lineRange, rangePtr, NSRange.sizeof);
-	    offsets[numberOfLines] = (int)/*64*/lineRange.location;
+	    offsets[numberOfLines] = (int)lineRange.location;
 	    index = lineRange.location + lineRange.length;
 	}
 	if (numberOfLines == 0) {
@@ -356,7 +356,7 @@ void computeRuns() {
 		bounds[0].height = Math.max(layoutManager.defaultLineHeightForFont(nsFont), ascent + descent);
 	}
 	C.free(rangePtr);
-	offsets[numberOfLines] = (int)/*64*/textStorage.length();
+	offsets[numberOfLines] = (int)textStorage.length();
 	this.lineOffsets = offsets;
 	this.lineBounds = bounds;
 }
@@ -461,7 +461,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
 		pt.x = x;
 		pt.y = y;
 		NSRange range = new NSRange();
-		long /*int*/ numberOfGlyphs = layoutManager.numberOfGlyphs();
+		long numberOfGlyphs = layoutManager.numberOfGlyphs();
 		if (numberOfGlyphs > 0) {
 			range.location = 0;
 			range.length = numberOfGlyphs;
@@ -476,8 +476,8 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
 			if (hasSelection) {
 				range.location = translateOffset(selectionStart);
 				range.length = translateOffset(selectionEnd - selectionStart + 1);
-				long /*int*/ [] rectCount = new long /*int*/ [1];
-				long /*int*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
+				long [] rectCount = new long [1];
+				long pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
 				for (int k = 0; k < rectCount[0]; k++, pArray += NSRect.sizeof) {
 					OS.memmove(rect, pArray, NSRect.sizeof);
 					fixRect(rect);
@@ -502,7 +502,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
 		if (numberOfGlyphs > 0) {
 			range.location = 0;
 			range.length = numberOfGlyphs;
-			double /*float*/ [] fg = gc.data.foreground;
+			double [] fg = gc.data.foreground;
 			boolean defaultFg = fg[0] == 0 && fg[1] == 0 && fg[2] == 0 && fg[3] == 1 && gc.data.alpha == 255;
 			if (!defaultFg) {
 				for (int i = 0; i < stylesCount - 1; i++) {
@@ -546,12 +546,12 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
 							range.location = Math.max(lineStart, start);
 							range.length = Math.min(lineEnd, end) + 1 - range.location;
 							if (range.length > 0) {
-								long /*int*/ [] rectCount = new long /*int*/ [1];
-								long /*int*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
+								long [] rectCount = new long [1];
+								long pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
 								NSRect rect = new NSRect();
 								gc.handle.saveGraphicsState();
-								double /*float*/ baseline = layoutManager.typesetter().baselineOffsetInLayoutManager(layoutManager, lineStart);
-								double /*float*/ [] color = null;
+								double baseline = layoutManager.typesetter().baselineOffsetInLayoutManager(layoutManager, lineStart);
+								double [] color = null;
 								if (style.underlineColor != null) color = style.underlineColor.handle;
 								if (color == null && style.foreground != null) color = style.foreground.handle;
 								if (color != null) {
@@ -560,15 +560,15 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
 								for (int k = 0; k < rectCount[0]; k++, pArray += NSRect.sizeof) {
 									OS.memmove(rect, pArray, NSRect.sizeof);
 									fixRect(rect);
-									double /*float*/ underlineX = pt.x + rect.x;
-									double /*float*/ underlineY = pt.y + rect.y + rect.height - baseline + 1;
+									double underlineX = pt.x + rect.x;
+									double underlineY = pt.y + rect.y + rect.height - baseline + 1;
 									NSBezierPath path = NSBezierPath.bezierPath();
 									switch (style.underlineStyle) {
 										case SWT.UNDERLINE_ERROR: {
 											path.setLineWidth(2f);
 											path.setLineCapStyle(OS.NSRoundLineCapStyle);
 											path.setLineJoinStyle(OS.NSRoundLineJoinStyle);
-											path.setLineDash(new double /*float*/ []{1, 3f}, 2, 0);
+											path.setLineDash(new double []{1, 3f}, 2, 0);
 											point.x = underlineX;
 											point.y = underlineY + 0.5f;
 											path.moveToPoint(point);
@@ -582,10 +582,10 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
 											path.setLineWidth(1.0f);
 											path.setLineCapStyle(OS.NSButtLineCapStyle);
 											path.setLineJoinStyle(OS.NSMiterLineJoinStyle);
-											double /*float*/ lineBottom = pt.y + rect.y + rect.height;
+											double lineBottom = pt.y + rect.y + rect.height;
 											float squigglyThickness = 1;
 											float squigglyHeight = 2 * squigglyThickness;
-											double /*float*/ squigglyY = Math.min(underlineY - squigglyHeight / 2, lineBottom - squigglyHeight - 1);
+											double squigglyY = Math.min(underlineY - squigglyHeight / 2, lineBottom - squigglyHeight - 1);
 											float[] points = computePolyline((int)underlineX, (int)squigglyY, (int)(underlineX + rect.width), (int)(squigglyY + squigglyHeight));
 											point.x = points[0] + 0.5f;
 											point.y = points[1] + 0.5f;
@@ -614,11 +614,11 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
 							range.location = Math.max(lineStart, start);
 							range.length = Math.min(lineEnd, end) + 1 - range.location;
 							if (range.length > 0) {
-								long /*int*/ [] rectCount = new long /*int*/ [1];
-								long /*int*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
+								long [] rectCount = new long [1];
+								long pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
 								NSRect rect = new NSRect();
 								gc.handle.saveGraphicsState();
-								double /*float*/ [] color = null;
+								double [] color = null;
 								if (style.borderColor != null) color = style.borderColor.handle;
 								if (color == null && style.foreground != null) color = style.foreground.handle;
 								if (color != null) {
@@ -631,9 +631,9 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
 									case SWT.BORDER_DASH: dashes = width != 0 ? GC.LINE_DASH : GC.LINE_DASH_ZERO; break;
 									case SWT.BORDER_DOT: dashes = width != 0 ? GC.LINE_DOT : GC.LINE_DOT_ZERO; break;
 								}
-								double /*float*/ [] lengths = null;
+								double [] lengths = null;
 								if (dashes != null) {
-									lengths = new double /*float*/[dashes.length];
+									lengths = new double[dashes.length];
 									for (int k = 0; k < lengths.length; k++) {
 										lengths[k] = width == 0 ? dashes[k] : dashes[k] * width;
 									}
@@ -664,7 +664,7 @@ public void draw(GC gc, int x, int y, int selectionStart, int selectionEnd, Colo
 }
 
 void fixRect(NSRect rect) {
-	double /*float*/ right = -1;
+	double right = -1;
 	for (int j = 0; j < lineBounds.length; j++) {
 		NSRect line = lineBounds[j];
 		if (rect.y <= line.y && line.y <= rect.y + rect.height) {
@@ -790,8 +790,8 @@ public Rectangle getBounds(int start, int end) {
 		NSRange range = new NSRange();
 		range.location = start;
 		range.length = end - start + 1;
-		long /*int*/ [] rectCount = new long /*int*/ [1];
-		long /*int*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
+		long [] rectCount = new long [1];
+		long pArray = layoutManager.rectArrayForCharacterRange(range, range, textContainer, rectCount);
 		NSRect rect = new NSRect();
 		int left = 0x7FFFFFFF, right = 0;
 		int top = 0x7FFFFFFF, bottom = 0;
@@ -898,7 +898,7 @@ public int getLevel(int offset) {
 		int length = text.length();
 		if (!(0 <= offset && offset <= length)) SWT.error(SWT.ERROR_INVALID_RANGE);
 		offset = translateOffset(offset);
-		long /*int*/ glyphOffset = layoutManager.glyphIndexForCharacterAtIndex(offset);
+		long glyphOffset = layoutManager.glyphIndexForCharacterAtIndex(offset);
 		NSRange range  = new NSRange();
 		range.location = glyphOffset;
 		range.length = 1;
@@ -1089,7 +1089,7 @@ public Point getLocation(int offset, boolean trailing) {
 			return new Point((int)(rect.x + rect.width), (int)rect.y);
 		} else {
 			offset = translateOffset(offset);
-			long /*int*/ glyphIndex = layoutManager.glyphIndexForCharacterAtIndex(offset);
+			long glyphIndex = layoutManager.glyphIndexForCharacterAtIndex(offset);
 			NSRect rect = layoutManager.lineFragmentUsedRectForGlyphAtIndex(glyphIndex, 0);
 			NSPoint point = layoutManager.locationForGlyphAtIndex(glyphIndex);
 			boolean rtl = false;
@@ -1097,13 +1097,13 @@ public Point getLocation(int offset, boolean trailing) {
 			range.location = glyphIndex;
 			range.length = 1;
 			byte[] bidiLevels = new byte[1];
-			long /*int*/ result = layoutManager.getGlyphsInRange(range, 0, 0, 0, 0, bidiLevels);
+			long result = layoutManager.getGlyphsInRange(range, 0, 0, 0, 0, bidiLevels);
 			if (result > 0) {
 				rtl = (bidiLevels[0] & 1) != 0;
 			}
 			if (trailing != rtl) {
-				long /*int*/ [] rectCount = new long /*int*/ [1];
-				long /*int*/ pArray = layoutManager.rectArrayForGlyphRange(range, range, textContainer, rectCount);
+				long [] rectCount = new long [1];
+				long pArray = layoutManager.rectArrayForGlyphRange(range, range, textContainer, rectCount);
 				if (rectCount[0] > 0) {
 					NSRect bounds = new NSRect();
 					OS.memmove(bounds, pArray, NSRect.sizeof);
@@ -1174,18 +1174,18 @@ int _getOffset (int offset, int movement, boolean forward) {
 			break;
 		case SWT.MOVEMENT_WORD: {
 			offset = translateOffset(offset);
-			offset = (int)/*64*/textStorage.nextWordFromIndex(offset, forward);
+			offset = (int)textStorage.nextWordFromIndex(offset, forward);
 			return untranslateOffset(offset);
 		}
 		case SWT.MOVEMENT_WORD_END: {
 			offset = translateOffset(offset);
 			if (forward) {
-				offset = (int)/*64*/textStorage.nextWordFromIndex(offset, true);
+				offset = (int)textStorage.nextWordFromIndex(offset, true);
 			} else {
 				length = translateOffset(length);
 				int result = 0;
 				while (result < length) {
-					int wordEnd = (int)/*64*/textStorage.nextWordFromIndex(result, true);
+					int wordEnd = (int)textStorage.nextWordFromIndex(result, true);
 					if (wordEnd >= offset) {
 						offset = result;
 						break;
@@ -1200,7 +1200,7 @@ int _getOffset (int offset, int movement, boolean forward) {
 			if (forward) {
 				int result = translateOffset(length);
 				while (result > 0) {
-					int wordStart = (int)/*64*/textStorage.nextWordFromIndex(result, false);
+					int wordStart = (int)textStorage.nextWordFromIndex(result, false);
 					if (wordStart <= offset) {
 						offset = result;
 						break;
@@ -1208,7 +1208,7 @@ int _getOffset (int offset, int movement, boolean forward) {
 					result = wordStart;
 				}
 			} else {
-				offset = (int)/*64*/textStorage.nextWordFromIndex(offset, false);
+				offset = (int)textStorage.nextWordFromIndex(offset, false);
 			}
 			return untranslateOffset(offset);
 		}
@@ -1280,14 +1280,14 @@ public int getOffset(int x, int y, int[] trailing) {
 		NSPoint pt = new NSPoint();
 		pt.x = x;
 		pt.y =  y - getVerticalIndent();
-		double /*float*/[] partialFraction = new double /*float*/[1];
-		long /*int*/ glyphIndex = layoutManager.glyphIndexForPoint(pt, textContainer, partialFraction);
-		long /*int*/ charOffset = layoutManager.characterIndexForGlyphAtIndex(glyphIndex);
+		double[] partialFraction = new double[1];
+		long glyphIndex = layoutManager.glyphIndexForPoint(pt, textContainer, partialFraction);
+		long charOffset = layoutManager.characterIndexForGlyphAtIndex(glyphIndex);
 		if (textStorage.string().characterAtIndex(charOffset) == '\n') charOffset--;
-		int offset = (int)/*64*/charOffset;
+		int offset = (int)charOffset;
 		offset = Math.min(untranslateOffset(offset), length - 1);
 		if (trailing != null) {
-			trailing[0] = Math.round((float)/*64*/partialFraction[0]);
+			trailing[0] = Math.round((float)partialFraction[0]);
 			if (partialFraction[0] >= 0.5) {
 				char ch = text.charAt(offset);
 				if (0xD800 <= ch && ch <= 0xDBFF) {
@@ -1608,20 +1608,20 @@ void initClasses () {
 	if (OS.objc_lookUpClass(className) != 0) return;
 
 	textLayoutCallback2 = new Callback(getClass(), "textLayoutProc", 2);
-	long /*int*/ proc2 = textLayoutCallback2.getAddress();
+	long proc2 = textLayoutCallback2.getAddress();
 	if (proc2 == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS);
-	long /*int*/ cellBaselineOffsetProc = OS.CALLBACK_cellBaselineOffset(proc2);
-	long /*int*/ cellSizeProc = OS.CALLBACK_NSTextAttachmentCell_cellSize(proc2);
+	long cellBaselineOffsetProc = OS.CALLBACK_cellBaselineOffset(proc2);
+	long cellSizeProc = OS.CALLBACK_NSTextAttachmentCell_cellSize(proc2);
 
 	byte[] types = {'*','\0'};
 	int size = C.PTR_SIZEOF, align = C.PTR_SIZEOF == 4 ? 2 : 3;
-	long /*int*/ cls = OS.objc_allocateClassPair(OS.class_NSCell, className, 0);
+	long cls = OS.objc_allocateClassPair(OS.class_NSCell, className, 0);
 	OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
 	OS.class_addProtocol(cls, OS.protocol_NSTextAttachmentCell);
 	OS.class_addMethod(cls, OS.sel_cellSize, cellSizeProc, "@:");
 	OS.class_addMethod(cls, OS.sel_cellBaselineOffset, cellBaselineOffsetProc, "@:");
 	if (OS.VERSION_MMB >= OS.VERSION_MMB(10, 11, 0)) {
-		long /*int*/ attachmentProc = OS.CALLBACK_NSTextAttachmentCell_attachment(proc2);
+		long attachmentProc = OS.CALLBACK_NSTextAttachmentCell_attachment(proc2);
 		OS.class_addMethod(cls, OS.sel_attachment, attachmentProc, "@:");
 	}
 	OS.objc_registerClassPair(cls);
@@ -2265,8 +2265,8 @@ public String toString () {
 	return "TextLayout {" + text + "}";
 }
 
-static long /*int*/ textLayoutProc(long /*int*/ id, long /*int*/ sel) {
-	long /*int*/ [] jniRef = new long /*int*/ [1];
+static long textLayoutProc(long id, long sel) {
+	long [] jniRef = new long [1];
 	OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
 	if (jniRef[0] == 0) return 0;
 	StyleItem run = (StyleItem) OS.JNIGetObject(jniRef[0]);
@@ -2280,14 +2280,14 @@ static long /*int*/ textLayoutProc(long /*int*/ id, long /*int*/ sel) {
 		size.width = metrics.width;
 		size.height = metrics.ascent + metrics.descent;
 		/* NOTE that this is freed in C */
-		long /*int*/ result = C.malloc(NSSize.sizeof);
+		long result = C.malloc(NSSize.sizeof);
 		OS.memmove(result, size, NSSize.sizeof);
 		return result;
 	} else if (sel == OS.sel_cellBaselineOffset) {
 		NSPoint point = new NSPoint();
 		point.y = -metrics.descent;
 		/* NOTE that this is freed in C */
-		long /*int*/ result = C.malloc(NSPoint.sizeof);
+		long result = C.malloc(NSPoint.sizeof);
 		OS.memmove(result, point, NSPoint.sizeof);
 		return result;
 	} else if (sel == OS.sel_attachment) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Transform.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Transform.java
index a01df3f31d..07e1bae057 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Transform.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Transform.java
@@ -191,12 +191,12 @@ public void getElements(float[] elements) {
 	if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
 		NSAffineTransformStruct struct = handle.transformStruct();
-		elements[0] = (float)/*64*/struct.m11;
-		elements[1] = (float)/*64*/struct.m12;
-		elements[2] = (float)/*64*/struct.m21;
-		elements[3] = (float)/*64*/struct.m22;
-		elements[4] = (float)/*64*/struct.tX;
-		elements[5] = (float)/*64*/struct.tY;
+		elements[0] = (float)struct.m11;
+		elements[1] = (float)struct.m12;
+		elements[2] = (float)struct.m21;
+		elements[3] = (float)struct.m22;
+		elements[4] = (float)struct.tX;
+		elements[5] = (float)struct.tY;
 	} finally {
 		if (pool != null) pool.release();
 	}
@@ -447,8 +447,8 @@ public void transform(float[] pointArray) {
 			point.x = pointArray[j];
 			point.y = pointArray[j + 1];
 			point = handle.transformPoint(point);
-			pointArray[j] = (float)/*64*/point.x;
-			pointArray[j + 1] = (float)/*64*/point.y;
+			pointArray[j] = (float)point.x;
+			pointArray[j + 1] = (float)point.y;
 		}
 	} finally {
 		if (pool != null) pool.release();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java
index 2e20e38246..7d6267708c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java
@@ -57,7 +57,7 @@ public class Button extends Control {
 	 */
 	private SWTView radioParent;
 
-	private static final double /*float*/ [] DEFAULT_DISABLED_FOREGROUND = new double /*float*/ [] { 0.6745f, 0.6745f, 0.6745f, 1.0f };
+	private static final double [] DEFAULT_DISABLED_FOREGROUND = new double [] { 0.6745f, 0.6745f, 0.6745f, 1.0f };
 
 	static final int EXTRA_HEIGHT = 2;
 	static final int EXTRA_WIDTH = 6;
@@ -147,7 +147,7 @@ public void addSelectionListener(SelectionListener listener) {
 }
 
 @Override
-NSSize cellSizeForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
+NSSize cellSizeForBounds (long id, long sel, NSRect cellFrame) {
 	NSSize size = super.cellSizeForBounds(id, sel, cellFrame);
 	if (image != null && ((style & (SWT.CHECK|SWT.RADIO)) !=0)) {
 		NSSize imageSize = image.handle.size();
@@ -173,7 +173,7 @@ NSSize cellSizeForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
 		NSAttributedString attribStr = createString(text, null, foreground, style, true, true, true);
 		NSRect rect = attribStr.boundingRectWithSize(wrapSize, OS.NSStringDrawingUsesLineFragmentOrigin);
 		attribStr.release();
-		double /*float*/ trimHeight = size.height - titleRect.height;
+		double trimHeight = size.height - titleRect.height;
 		size.height = rect.height;
 		if (image != null && ((style & (SWT.CHECK|SWT.RADIO)) !=0)) {
 			NSSize imageSize = image.handle.size();
@@ -316,7 +316,7 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) {
 }
 
 @Override
-void drawImageWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ image, NSRect rect, long /*int*/ view) {
+void drawImageWithFrameInView (long id, long sel, long image, NSRect rect, long view) {
 	/*
 	* Feature in Cocoa.  Images touch the edge of rounded buttons
 	* when set to small size. The fix to subclass the button cell
@@ -359,7 +359,7 @@ private static NSRect smallerRect (NSRect cellFrame, double dx, double dy1, doub
 }
 
 @Override
-void drawBezelWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ viewid) {
+void drawBezelWithFrame_inView (long id, long sel, NSRect cellFrame, long viewid) {
 	if (this.background != null) {
 		NSButton button = (NSButton) view;
 
@@ -369,7 +369,7 @@ void drawBezelWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFr
 		final NSButtonCell defaultButtonCell = window == null ? null : window.defaultButtonCell();
 		final boolean isDefault = defaultButtonCell != null && defaultButtonCell.id == id;
 
-		double /*float*/ [] borderRGB = getLighterOrDarkerColor(this.background, 0.3, luma(background) >= 0.5);
+		double [] borderRGB = getLighterOrDarkerColor(this.background, 0.3, luma(background) >= 0.5);
 		if (isHighlighted && (style & SWT.FLAT) != 0) {
 			borderRGB = getLighterOrDarkerColor(borderRGB, 0.2, true);
 		}
@@ -398,13 +398,13 @@ void drawBezelWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFr
 			path = NSBezierPath.bezierPathWithRect(rect2);
 		}
 		if (!isHighlighted) {
-			double /*float*/ [] backgroundRGB = this.background;
+			double [] backgroundRGB = this.background;
 			NSColor backgroundNSColor = NSColor.colorWithDeviceRed(backgroundRGB[0], backgroundRGB[1], backgroundRGB[2], 1f);
 
 			if((style & SWT.FLAT) == 0) {
-				double /*float*/ [] topRGB = getLighterOrDarkerColor(this.background, 0.2, false);
+				double [] topRGB = getLighterOrDarkerColor(this.background, 0.2, false);
 				NSColor topColor = NSColor.colorWithDeviceRed(topRGB[0], topRGB[1], topRGB[2], 1f);
-				double /*float*/ [] bottomRGB = getLighterOrDarkerColor(this.background, 0.1, true);
+				double [] bottomRGB = getLighterOrDarkerColor(this.background, 0.1, true);
 				NSColor bottomColor = NSColor.colorWithDeviceRed(bottomRGB[0], bottomRGB[1], bottomRGB[2], 1f);
 
 				NSMutableArray ma = NSMutableArray.arrayWithCapacity(4);
@@ -420,7 +420,7 @@ void drawBezelWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFr
 				path.fill();
 			}
 		} else {
-			double /*float*/ [] colorRGB0 = getLighterOrDarkerColor(this.background, 0.1f, true);
+			double [] colorRGB0 = getLighterOrDarkerColor(this.background, 0.1f, true);
 			NSColor color0 = NSColor.colorWithDeviceRed(colorRGB0[0], colorRGB0[1], colorRGB0[2], 1f);
 			color0.setFill();
 			path.fill();
@@ -439,7 +439,7 @@ void drawBezelWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFr
 }
 
 @Override
-void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellRect, long /*int*/ viewid) {
+void drawInteriorWithFrame_inView (long id, long sel, NSRect cellRect, long viewid) {
 	if ((style & (SWT.CHECK|SWT.RADIO)) != 0 && backgroundImage != null) {
 		fillBackground (new NSView(viewid), NSGraphicsContext.currentContext(), cellRect, -1);
 	}
@@ -447,8 +447,8 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cel
 	if (image != null && ((style & (SWT.CHECK|SWT.RADIO)) !=0)) {
 		NSSize imageSize = image.handle.size();
 		NSCell nsCell = new NSCell(id);
-		double /*float*/ x = 0;
-		double /*float*/ y = (imageSize.height - cellRect.height)/2f;
+		double x = 0;
+		double y = (imageSize.height - cellRect.height)/2f;
 		NSRect imageRect = nsCell.imageRectForBounds(cellRect);
 		NSSize stringSize = ((NSButton)view).attributedTitle().size();
 		switch (style & (SWT.LEFT|SWT.RIGHT|SWT.CENTER)) {
@@ -479,7 +479,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cel
 }
 
 @Override
-NSRect drawTitleWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ title, NSRect titleRect, long /*int*/ view) {
+NSRect drawTitleWithFrameInView (long id, long sel, long title, NSRect titleRect, long view) {
 	boolean wrap = (style & SWT.WRAP) != 0 && text.length() != 0;
 	boolean isEnabled = isEnabled();
 	if (wrap) {
@@ -527,7 +527,7 @@ boolean drawsBackground() {
 }
 
 @Override
-void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawWidget (long id, NSGraphicsContext context, NSRect rect) {
 	if ((style & SWT.ARROW) != 0) {
 		NSRect frame = view.frame();
 		int arrowSize = Math.min((int)frame.height, (int)frame.width) / 2;
@@ -569,7 +569,7 @@ void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
 }
 
 @Override
-NSRect focusRingMaskBoundsForFrame (long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ view) {
+NSRect focusRingMaskBoundsForFrame (long id, long sel, NSRect cellFrame, long view) {
 	return cellFrame;
 }
 
@@ -696,7 +696,7 @@ boolean isDescribedByLabel () {
  * to go directly to the desired state if we have a grayed checkbox.
  */
 @Override
-long /*int*/ nextState(long /*int*/ id, long /*int*/ sel) {
+long nextState(long id, long sel) {
 	if ((style & SWT.CHECK) != 0 && grayed) {
 		return ((NSButton)view).state() == OS.NSMixedState ? OS.NSOffState : OS.NSMixedState;
 	}
@@ -876,7 +876,7 @@ void setFont (NSFont font) {
 }
 
 @Override
-void setForeground (double /*float*/ [] color) {
+void setForeground (double [] color) {
 	((NSButton)view).setAttributedTitle(createString());
 }
 
@@ -1047,7 +1047,7 @@ public void setText (String string) {
 }
 
 @Override
-NSRect titleRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
+NSRect titleRectForBounds (long id, long sel, NSRect cellFrame) {
 	NSRect rect = super.titleRectForBounds(id, sel, cellFrame);
 	if (image != null && ((style & (SWT.CHECK|SWT.RADIO)) !=0)) {
 		NSSize imageSize = image.handle.size();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java
index d0aa9147e6..144a8eb84f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java
@@ -62,7 +62,7 @@ Canvas () {
 }
 
 @Override
-long /*int*/ attributedSubstringFromRange (long /*int*/ id, long /*int*/ sel, long /*int*/ range) {
+long attributedSubstringFromRange (long id, long sel, long range) {
 	if (ime != null) return ime.attributedSubstringFromRange (id, sel, range);
 	return super.attributedSubstringFromRange(id, sel, range);
 }
@@ -111,7 +111,7 @@ public Canvas (Composite parent, int style) {
 }
 
 @Override
-long /*int*/ characterIndexForPoint (long /*int*/ id, long /*int*/ sel, long /*int*/ point) {
+long characterIndexForPoint (long id, long sel, long point) {
 	if (ime != null) return ime.characterIndexForPoint (id, sel, point);
 	return super.characterIndexForPoint (id, sel, point);
 }
@@ -142,7 +142,7 @@ public void drawBackground (GC gc, int x, int y, int width, int height) {
 }
 
 @Override
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rect) {
 	super.drawBackground(id, context, rect);
 	if (glcontext != null) {
 		if (isObscured()) {
@@ -150,7 +150,7 @@ void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
 			context.saveGraphicsState();
 			context.setCompositingOperation(OS.NSCompositeClear);
 			if (visiblePath == null) {
-				long /*int*/ visibleRegion = getVisibleRegion();
+				long visibleRegion = getVisibleRegion();
 				visiblePath = getPath(visibleRegion);
 				OS.DisposeRgn(visibleRegion);
 			}
@@ -164,18 +164,18 @@ void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
 }
 
 @Override
-void drawRect (long /*int*/ id, long /*int*/ sel, NSRect rect) {
+void drawRect (long id, long sel, NSRect rect) {
 	if (glcontext != null && glcontext.view() == null) glcontext.setView(view);
 	super.drawRect(id, sel, rect);
 }
 
 @Override
-void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawWidget (long id, NSGraphicsContext context, NSRect rect) {
 	if (id != view.id) return;
 	super.drawWidget (id, context, rect);
 	if (caret == null) return;
 	if (caret.isShowing) {
-		long /*int*/ ctx = context.graphicsPort();
+		long ctx = context.graphicsPort();
 		OS.CGContextSaveGState (ctx);
 		OS.CGContextSetBlendMode (ctx, OS.kCGBlendModeDifference);
 		Image image = caret.image;
@@ -190,18 +190,18 @@ void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
 		 	NSSize size = imageHandle.size();
 			destRect.size.width = size.width;
 			destRect.size.height = size.height;
-		 	long /*int*/ data = rep.bitmapData();
-			long /*int*/ format = rep.bitmapFormat();
-		 	long /*int*/ bpr = rep.bytesPerRow();
+		 	long data = rep.bitmapData();
+			long format = rep.bitmapFormat();
+		 	long bpr = rep.bytesPerRow();
 			int alphaInfo;
 			if (rep.hasAlpha()) {
 				alphaInfo = (format & OS.NSAlphaFirstBitmapFormat) != 0 ? OS.kCGImageAlphaFirst : OS.kCGImageAlphaLast;
 			} else {
 				alphaInfo = (format & OS.NSAlphaFirstBitmapFormat) != 0 ? OS.kCGImageAlphaNoneSkipFirst : OS.kCGImageAlphaNoneSkipLast;
 			}
-		 	long /*int*/ provider = OS.CGDataProviderCreateWithData(0, data, bpr * (int)size.height, 0);
-			long /*int*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
-			long /*int*/ cgImage = OS.CGImageCreate((int)size.width, (int)size.height, rep.bitsPerSample(), rep.bitsPerPixel(), bpr, colorspace, alphaInfo, provider, 0, true, 0);
+		 	long provider = OS.CGDataProviderCreateWithData(0, data, bpr * (int)size.height, 0);
+			long colorspace = OS.CGColorSpaceCreateDeviceRGB();
+			long cgImage = OS.CGImageCreate((int)size.width, (int)size.height, rep.bitsPerSample(), rep.bitsPerPixel(), bpr, colorspace, alphaInfo, provider, 0, true, 0);
 			OS.CGColorSpaceRelease(colorspace);
 			OS.CGDataProviderRelease(provider);
 		 	OS.CGContextScaleCTM (ctx, 1, -1);
@@ -215,10 +215,10 @@ void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
 			drawRect.origin.y = caret.y;
 			drawRect.size.width = caret.width != 0 ? caret.width : Caret.DEFAULT_WIDTH;
 			drawRect.size.height = caret.height;
-			long /*int*/ colorspace = OS.CGColorSpaceCreateDeviceRGB();
+			long colorspace = OS.CGColorSpaceCreateDeviceRGB();
 			OS.CGContextSetFillColorSpace(ctx, colorspace);
 			OS.CGColorSpaceRelease(colorspace);
-			OS.CGContextSetFillColor(ctx, new double /*float*/ [] {1, 1, 1, 1});
+			OS.CGContextSetFillColor(ctx, new double [] {1, 1, 1, 1});
 			OS.CGContextFillRect(ctx, drawRect);
 		}
 		OS.CGContextRestoreGState(ctx);
@@ -226,7 +226,7 @@ void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
 }
 
 @Override
-NSRect firstRectForCharacterRange (long /*int*/ id, long /*int*/ sel, long /*int*/ range) {
+NSRect firstRectForCharacterRange (long id, long sel, long range) {
 	if (ime != null) return ime.firstRectForCharacterRange (id, sel, range);
 	return super.firstRectForCharacterRange (id, sel, range);
 }
@@ -272,7 +272,7 @@ public IME getIME () {
 }
 
 @Override
-boolean hasMarkedText (long /*int*/ id, long /*int*/ sel) {
+boolean hasMarkedText (long id, long sel) {
 	if (ime != null) return ime.hasMarkedText (id, sel);
 	return super.hasMarkedText (id, sel);
 }
@@ -283,7 +283,7 @@ boolean imeInComposition () {
 }
 
 @Override
-boolean insertText (long /*int*/ id, long /*int*/ sel, long /*int*/ string) {
+boolean insertText (long id, long sel, long string) {
 	if (ime != null) {
 		if (!ime.insertText (id, sel, string)) return false;
 	}
@@ -291,25 +291,25 @@ boolean insertText (long /*int*/ id, long /*int*/ sel, long /*int*/ string) {
 }
 
 @Override
-boolean isOpaque (long /*int*/ id, long /*int*/ sel) {
+boolean isOpaque (long id, long sel) {
 	if (glcontext != null) return true;
 	return super.isOpaque(id, sel);
 }
 
 @Override
-NSRange markedRange (long /*int*/ id, long /*int*/ sel) {
+NSRange markedRange (long id, long sel) {
 	if (ime != null) return ime.markedRange (id, sel);
 	return super.markedRange (id, sel);
 }
 
 @Override
-boolean readSelectionFromPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ pasteboard) {
+boolean readSelectionFromPasteboard(long id, long sel, long pasteboard) {
     boolean result = false;
     NSPasteboard pboard = new NSPasteboard(pasteboard);
     NSArray availableTypes = pboard.types();
     NSString type;
 
-    for (long /*int*/ i = 0; i < supportedPboardTypes.count(); i++) {
+    for (long i = 0; i < supportedPboardTypes.count(); i++) {
     	if (result) break;
     	type = new NSString(supportedPboardTypes.objectAtIndex(i));
         if (availableTypes.containsObject(type)) {
@@ -510,7 +510,7 @@ public void scroll (int destX, int destY, int x, int y, int width, int height, b
 }
 
 @Override
-NSRange selectedRange (long /*int*/ id, long /*int*/ sel) {
+NSRange selectedRange (long id, long sel) {
 	if (ime != null) return ime.selectedRange (id, sel);
 	return super.selectedRange (id, sel);
 }
@@ -596,7 +596,7 @@ public void setIME (IME ime) {
 }
 
 @Override
-boolean setMarkedText_selectedRange (long /*int*/ id, long /*int*/ sel, long /*int*/ string, long /*int*/ range) {
+boolean setMarkedText_selectedRange (long id, long sel, long string, long range) {
 	if (ime != null) {
 		if (!ime.setMarkedText_selectedRange (id, sel, string, range)) return false;
 	}
@@ -604,13 +604,13 @@ boolean setMarkedText_selectedRange (long /*int*/ id, long /*int*/ sel, long /*i
 }
 
 @Override
-long /*int*/ validAttributesForMarkedText (long /*int*/ id, long /*int*/ sel) {
+long validAttributesForMarkedText (long id, long sel) {
 	if (ime != null) return ime.validAttributesForMarkedText (id, sel);
 	return super.validAttributesForMarkedText(id, sel);
 }
 
 @Override
-long /*int*/ validRequestorForSendType(long /*int*/ id, long /*int*/ sel, long /*int*/ sendType, long /*int*/ returnType) {
+long validRequestorForSendType(long id, long sel, long sendType, long returnType) {
 	if (id == view.id) {
 		Accessible acc = getAccessible();
 		if (acc != null) {
@@ -637,12 +637,12 @@ long /*int*/ validRequestorForSendType(long /*int*/ id, long /*int*/ sel, long /
 }
 
 @Override
-void updateOpenGLContext(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void updateOpenGLContext(long id, long sel, long notification) {
 	if (glcontext != null) ((NSOpenGLContext)glcontext).update();
 }
 
 @Override
-void viewWillMoveToWindow(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void viewWillMoveToWindow(long id, long sel, long arg0) {
 	super.viewWillMoveToWindow(id, sel, arg0);
 	if (glcontext != null && id == view.id && arg0 != 0) {
 		Widget newShell = display.getWidget(new NSWindow(arg0).contentView());
@@ -657,21 +657,21 @@ void viewWillMoveToWindow(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0)
 }
 
 @Override
-boolean writeSelectionToPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ pasteboardObj, long /*int*/ typesObj) {
+boolean writeSelectionToPasteboard(long id, long sel, long pasteboardObj, long typesObj) {
     boolean result = false;
     NSPasteboard pboard = new NSPasteboard(pasteboardObj);
     NSArray types = new NSArray(typesObj);
     NSMutableArray typesToDeclare = NSMutableArray.arrayWithCapacity(2);
     NSString type;
 
-    for (long /*int*/ i = 0; i < supportedPboardTypes.count(); i++) {
+    for (long i = 0; i < supportedPboardTypes.count(); i++) {
     	type = new NSString(supportedPboardTypes.objectAtIndex(i));
         if (types.containsObject(type)) typesToDeclare.addObject(type);
     }
 
     if (typesToDeclare.count() > 0) {
         pboard.declareTypes(typesToDeclare, view);
-        for (long /*int*/ i = 0; i < typesToDeclare.count(); i++) {
+        for (long i = 0; i < typesToDeclare.count(); i++) {
         	type = new NSString(typesToDeclare.objectAtIndex(i));
             if (writeSelectionToPasteboard(pboard, type)) result = true;
         }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java
index 9baf68d180..0dde704bb0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java
@@ -94,7 +94,7 @@ public ColorDialog(Shell parent, int style) {
 	checkSubclass ();
 }
 
-void changeColor(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
+void changeColor(long id, long sel, long sender) {
 	selected = true;
 }
 
@@ -153,7 +153,7 @@ public RGB open() {
 	}
 	if (rgbs != null) {
 		NSArray keys = colorList.allKeys();
-		int length = (int)/*64*/keys.count();
+		int length = (int)keys.count();
 		for (int i=length-1; i>=0; i--) {
 			colorList.removeColorWithKey(new NSString(keys.objectAtIndex(i)));
 		}
@@ -170,7 +170,7 @@ public RGB open() {
 		}
 	}
 	SWTPanelDelegate delegate = (SWTPanelDelegate)new SWTPanelDelegate().alloc().init();
-	long /*int*/ jniRef = OS.NewGlobalRef(this);
+	long jniRef = OS.NewGlobalRef(this);
 	if (jniRef == 0) error(SWT.ERROR_NO_HANDLES);
 	OS.object_setInstanceVariable(delegate.id, Display.SWT_OBJECT, jniRef);
 	panel.setDelegate(delegate);
@@ -186,18 +186,18 @@ public RGB open() {
 	if (selected) {
 		NSColor color = panel.color();
 		if (color != null) {
-			double /*float*/ [] handle = display.getNSColorRGB(color);
+			double [] handle = display.getNSColorRGB(color);
 			if (handle != null) {
 				rgb = new RGB((int)(handle[0] * 255), (int)(handle[1] * 255), (int)(handle[2] * 255));
 			}
 		}
 	}
 	NSArray keys = colorList.allKeys();
-	int length = (int)/*64*/keys.count();
+	int length = (int)keys.count();
 	rgbs = new RGB[length];
 	for (int i=0; i<length; i++) {
 		NSString key = new NSString(keys.objectAtIndex(i));
-		double /*float*/ [] handle = display.getNSColorRGB(colorList.colorWithKey(key));
+		double [] handle = display.getNSColorRGB(colorList.colorWithKey(key));
 		if (handle != null) {
 			rgbs[i] = new RGB((int)(handle[0] * 255), (int)(handle[1] * 255), (int)(handle[2] * 255));
 		}
@@ -235,7 +235,7 @@ public void setRGBs(RGB[] rgbs) {
 	this.rgbs = rgbs;
 }
 
-void windowWillClose(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
+void windowWillClose(long id, long sel, long sender) {
 	NSApplication.sharedApplication().stop(null);
 }
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java
index 3f514284a4..f86c9244f7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java
@@ -143,7 +143,7 @@ public void add (String string) {
 	NSAttributedString str = createString(string);
 	if ((style & SWT.READ_ONLY) != 0) {
 		NSPopUpButton widget = (NSPopUpButton)view;
-		long /*int*/ selection = widget.indexOfSelectedItem();
+		long selection = widget.indexOfSelectedItem();
 		NSMenu nsMenu = widget.menu();
 		NSMenuItem nsItem = (NSMenuItem)new NSMenuItem().alloc();
 		NSString empty = NSString.string();
@@ -191,7 +191,7 @@ public void add (String string, int index) {
 	NSAttributedString str = createString(string);
 	if ((style & SWT.READ_ONLY) != 0) {
 		NSPopUpButton widget = (NSPopUpButton)view;
-		long /*int*/ selection = widget.indexOfSelectedItem();
+		long selection = widget.indexOfSelectedItem();
 		NSMenu nsMenu = widget.menu();
 		NSMenuItem nsItem = (NSMenuItem)new NSMenuItem().alloc();
 		NSString empty = NSString.string();
@@ -332,7 +332,7 @@ public void addVerifyListener (VerifyListener listener) {
 }
 
 @Override
-boolean becomeFirstResponder (long /*int*/ id, long /*int*/ sel) {
+boolean becomeFirstResponder (long id, long sel) {
 	receivingFocus = true;
 	boolean result = super.becomeFirstResponder (id, sel);
 	receivingFocus = false;
@@ -399,14 +399,14 @@ public void clearSelection () {
 }
 
 @Override
-void setObjectValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void setObjectValue(long id, long sel, long arg0) {
 	super.setObjectValue(id, sel, ignoreSetObject ? arg0 : createString(text).id);
 }
 
 @Override
-void comboBoxSelectionDidChange(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void comboBoxSelectionDidChange(long id, long sel, long notification) {
 	NSComboBox widget = (NSComboBox)view;
-	long /*int*/ tableSelection = widget.indexOfSelectedItem();
+	long tableSelection = widget.indexOfSelectedItem();
 	widget.selectItemAtIndex(tableSelection);
 	NSAttributedString attStr = new NSAttributedString (widget.itemObjectValueAtIndex(tableSelection));
 	NSString nsString = attStr.string();
@@ -428,7 +428,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
 		ignoreSetObject = true;
 		NSComboBoxCell cell = new NSComboBoxCell (viewCell.id);
 		NSArray array = cell.objectValues ();
-		int length = (int)/*64*/array.count ();
+		int length = (int)array.count ();
 		if (length > 0) {
 			cell = new NSComboBoxCell (cell.copy ());
 			for (int i = 0; i < length; i++) {
@@ -547,13 +547,13 @@ void createWidget() {
 }
 
 @Override
-void comboBoxWillDismiss(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void comboBoxWillDismiss(long id, long sel, long notification) {
 	display.currentCombo = null;
 	listVisible = false;
 }
 
 @Override
-void comboBoxWillPopUp(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void comboBoxWillPopUp(long id, long sel, long notification) {
 	display.currentCombo = this;
 	listVisible = true;
 }
@@ -664,7 +664,7 @@ public void deselectAll () {
 		sendEvent (SWT.Modify);
 	} else {
 		NSComboBox widget = (NSComboBox)view;
-		long /*int*/ index = widget.indexOfSelectedItem();
+		long index = widget.indexOfSelectedItem();
 		if (index != -1) widget.deselectItemAtIndex(index);
 	}
 }
@@ -680,7 +680,7 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) {
 				NSPoint textViewMouse = new NSPoint();
 				textViewMouse.x = x;
 				textViewMouse.y = y;
-				long /*int*/ charPosition = feAsTextView.characterIndexForInsertionAtPoint(textViewMouse);
+				long charPosition = feAsTextView.characterIndexForInsertionAtPoint(textViewMouse);
 				if (charPosition != OS.NSNotFound() && charPosition >= selectedRange.location && charPosition < (selectedRange.location + selectedRange.length)) {
 					if (super.dragDetect(x, y, filter, consume)) {
 						if (consume != null) consume[0] = true;
@@ -702,7 +702,7 @@ Cursor findCursor () {
 }
 
 @Override
-NSRect focusRingMaskBoundsForFrame (long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ view) {
+NSRect focusRingMaskBoundsForFrame (long id, long sel, NSRect cellFrame, long view) {
 	return cellFrame;
 }
 
@@ -723,7 +723,7 @@ NSRect focusRingMaskBoundsForFrame (long /*int*/ id, long /*int*/ sel, NSRect ce
  */
 public int getCaretPosition() {
 	checkWidget();
-	return selectionRange != null ? (int)/*64*/selectionRange.location : 0;
+	return selectionRange != null ? (int)selectionRange.location : 0;
 }
 
 /**
@@ -749,8 +749,8 @@ public Point getCaretLocation() {
 	NSLayoutManager layoutManager = widget.layoutManager();
 	NSTextContainer container = widget.textContainer();
 	NSRange range = widget.selectedRange();
-	long /*int*/ [] rectCount = new long /*int*/ [1];
-	long /*int*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, container, rectCount);
+	long [] rectCount = new long [1];
+	long pArray = layoutManager.rectArrayForCharacterRange(range, range, container, rectCount);
 	NSRect rect = new NSRect();
 	if (rectCount[0] > 0) OS.memmove(rect, pArray, NSRect.sizeof);
 	NSPoint pt = new NSPoint();
@@ -768,7 +768,7 @@ int getCharCount() {
 		str = new NSCell(((NSComboBox)view).cell()).title();
 	}
 	if (str == null) return 0;
-	return (int)/*64*/str.length();
+	return (int)str.length();
 }
 
 /**
@@ -815,9 +815,9 @@ public String getItem (int index) {
 public int getItemCount () {
 	checkWidget ();
 	if ((style & SWT.READ_ONLY) != 0) {
-		return (int)/*64*/((NSPopUpButton)view).numberOfItems();
+		return (int)((NSPopUpButton)view).numberOfItems();
 	} else {
-		return (int)/*64*/((NSComboBox)view).numberOfItems();
+		return (int)((NSComboBox)view).numberOfItems();
 	}
 }
 
@@ -940,9 +940,9 @@ public Point getSelection () {
 	} else {
 		if (selectionRange == null) {
 			NSString str = new NSTextFieldCell (((NSTextField) view).cell ()).title ();
-			return new Point((int)/*64*/str.length (), (int)/*64*/str.length ());
+			return new Point((int)str.length (), (int)str.length ());
 		}
-		return new Point((int)/*64*/selectionRange.location, (int)/*64*/(selectionRange.location + selectionRange.length));
+		return new Point((int)selectionRange.location, (int)(selectionRange.location + selectionRange.length));
 	}
 }
 
@@ -960,9 +960,9 @@ public Point getSelection () {
 public int getSelectionIndex () {
 	checkWidget ();
 	if ((style & SWT.READ_ONLY) != 0) {
-		return (int)/*64*/((NSPopUpButton)view).indexOfSelectedItem();
+		return (int)((NSPopUpButton)view).indexOfSelectedItem();
 	} else {
-		return (int)/*64*/((NSComboBox)view).indexOfSelectedItem();
+		return (int)((NSComboBox)view).indexOfSelectedItem();
 	}
 }
 
@@ -994,12 +994,12 @@ char [] getText (int start, int end) {
 	NSRange range = new NSRange ();
 	range.location = start;
 	if (end == -1) {
-		long /*int*/ length = str.length();
+		long length = str.length();
 		range.length = length - start;
 	} else {
 		range.length = end - start;
 	}
-	char [] buffer= new char [(int)/*64*/range.length];
+	char [] buffer= new char [(int)range.length];
 	str.getCharacters(buffer, range);
 	return buffer;
 }
@@ -1067,7 +1067,7 @@ public int getVisibleItemCount () {
 	if ((style & SWT.READ_ONLY) != 0) {
 		return getItemCount ();
 	} else {
-		return (int)/*64*/((NSComboBox)view).numberOfVisibleItems();
+		return (int)((NSComboBox)view).numberOfVisibleItems();
 	}
 }
 
@@ -1125,22 +1125,22 @@ public int indexOf (String string, int start) {
 }
 
 @Override
-boolean isEventView (long /*int*/ id) {
+boolean isEventView (long id) {
 	return true;
 }
 
 @Override
-void menuWillOpen(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
+void menuWillOpen(long id, long sel, long menu) {
 	listVisible = true;
 }
 
 @Override
-void menuDidClose(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
+void menuDidClose(long id, long sel, long menu) {
 	listVisible = false;
 }
 
 @Override
-void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDown(long id, long sel, long theEvent) {
 	// If this is a combo box with an editor field and the control is disposed
 	// while the view's cell editor is open we crash while tearing down the
 	// popup window. Fix is to retain the view before letting Cocoa track
@@ -1455,7 +1455,7 @@ boolean sendKeyEvent (NSEvent nsEvent, int type) {
 	boolean result = super.sendKeyEvent (nsEvent, type);
 	if (!result) return result;
 	int stateMask = 0;
-	long /*int*/ modifierFlags = nsEvent.modifierFlags();
+	long modifierFlags = nsEvent.modifierFlags();
 	if ((modifierFlags & OS.NSAlternateKeyMask) != 0) stateMask |= SWT.ALT;
 	if ((modifierFlags & OS.NSShiftKeyMask) != 0) stateMask |= SWT.SHIFT;
 	if ((modifierFlags & OS.NSControlKeyMask) != 0) stateMask |= SWT.CONTROL;
@@ -1495,7 +1495,7 @@ boolean sendTrackingKeyEvent (NSEvent nsEvent, int type) {
 	* to send these events when the event is removed from the
 	* queue.
 	*/
-	long /*int*/ modifiers = nsEvent.modifierFlags();
+	long modifiers = nsEvent.modifierFlags();
 	if ((modifiers & OS.NSShiftKeyMask) == 0) {
 		short keyCode = nsEvent.keyCode ();
 		switch (keyCode) {
@@ -1561,7 +1561,7 @@ void setFont (NSFont font) {
 }
 
 @Override
-void setForeground (double /*float*/ [] color) {
+void setForeground (double [] color) {
 	super.setForeground(color);
 	updateItems();
 	if ((style & SWT.READ_ONLY) == 0) {
@@ -1733,7 +1733,7 @@ public void setSelection (Point selection) {
 	if ((style & SWT.READ_ONLY) == 0) {
 		NSComboBox widget = (NSComboBox)view;
 		NSString str = new NSCell(widget.cell()).title();
-		int length = (int)/*64*/str.length();
+		int length = (int)str.length();
 		int start = Math.min (Math.max (Math.min (selection.x, selection.y), 0), length);
 		int end = Math.min (Math.max (Math.max (selection.x, selection.y), 0), length);
 		selectionRange = new NSRange();
@@ -1854,16 +1854,16 @@ public void setVisibleItemCount (int count) {
 }
 
 @Override
-boolean shouldChangeTextInRange_replacementString(long /*int*/ id, long /*int*/ sel, long /*int*/ affectedCharRange, long /*int*/ replacementString) {
+boolean shouldChangeTextInRange_replacementString(long id, long sel, long affectedCharRange, long replacementString) {
 	NSRange range = new NSRange();
 	OS.memmove(range, affectedCharRange, NSRange.sizeof);
 	boolean result = callSuperBoolean(id, sel, range, replacementString);
 	if (hooks (SWT.Verify)) {
 		String string = new NSString(replacementString).getString();
 		NSEvent currentEvent = display.application.currentEvent();
-		long /*int*/ type = currentEvent.type();
+		long type = currentEvent.type();
 		if (type != OS.NSKeyDown && type != OS.NSKeyUp) currentEvent = null;
-		String newText = verifyText(string, (int)/*64*/range.location, (int)/*64*/(range.location+range.length), currentEvent);
+		String newText = verifyText(string, (int)range.location, (int)(range.location+range.length), currentEvent);
 		if (newText == null) return false;
 		if (!string.equals(newText)) {
 			int length = newText.length();
@@ -1896,20 +1896,20 @@ boolean shouldChangeTextInRange_replacementString(long /*int*/ id, long /*int*/
 }
 
 @Override
-void textViewDidChangeSelection(long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void textViewDidChangeSelection(long id, long sel, long aNotification) {
 	NSNotification notification = new NSNotification(aNotification);
 	NSText editor = new NSText(notification.object().id);
 	selectionRange = editor.selectedRange();
 }
 
 @Override
-void textDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void textDidChange (long id, long sel, long aNotification) {
 	super.textDidChange (id, sel, aNotification);
 	postEvent (SWT.Modify);
 }
 
 @Override
-NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange(long /*int*/ id, long /*int*/ sel, long /*int*/ aTextView, long /*int*/ oldSelectedCharRange, long /*int*/ newSelectedCharRange) {
+NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange(long id, long sel, long aTextView, long oldSelectedCharRange, long newSelectedCharRange) {
 	/*
 	* If the selection is changing as a result of the receiver getting focus
 	* then return the receiver's last selection range, otherwise the full
@@ -1926,7 +1926,7 @@ NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange(long /*i
 void updateItems () {
 	if ((style & SWT.READ_ONLY) != 0) {
 		NSPopUpButton widget = (NSPopUpButton)view;
-		int count = (int)/*64*/ widget.numberOfItems();
+		int count = (int) widget.numberOfItems();
 		for (int i = 0; i < count; i++) {
 			NSMenuItem item = new NSMenuItem (widget.itemAtIndex(i));
 			NSAttributedString attStr = item.attributedTitle();
@@ -1935,7 +1935,7 @@ void updateItems () {
 		}
 	} else {
 		NSComboBox widget = (NSComboBox)view;
-		int count = (int)/*64*/ widget.numberOfItems();
+		int count = (int) widget.numberOfItems();
 		for (int i = 0; i < count; i++) {
 			NSAttributedString attStr = new NSAttributedString (widget.itemObjectValueAtIndex(i));
 			String string = attStr.string().getString();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java
index ef7256a2b0..aa0c9ef8b4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java
@@ -97,7 +97,7 @@ public Composite (Composite parent, int style) {
 
 Control [] _getChildren () {
 	NSArray views = contentView().subviews();
-	int count = (int)/*64*/views.count();
+	int count = (int)views.count();
 	Control [] children = new Control [count];
 	if (count == 0) return children;
 	int j = 0;
@@ -132,7 +132,7 @@ Control [] _getTabList () {
 }
 
 @Override
-boolean acceptsFirstMouse (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+boolean acceptsFirstMouse (long id, long sel, long theEvent) {
 	if ((state & CANVAS) != 0) {
 		return true;
 	}
@@ -140,7 +140,7 @@ boolean acceptsFirstMouse (long /*int*/ id, long /*int*/ sel, long /*int*/ theEv
 }
 
 @Override
-boolean acceptsFirstResponder (long /*int*/ id, long /*int*/ sel) {
+boolean acceptsFirstResponder (long id, long sel) {
 	if ((state & CANVAS) != 0) {
 		if ((style & SWT.NO_FOCUS) == 0 && hooksKeys ()) {
 			if (contentView().subviews().count() == 0) return true;
@@ -151,9 +151,9 @@ boolean acceptsFirstResponder (long /*int*/ id, long /*int*/ sel) {
 }
 
 @Override
-long /*int*/ accessibilityAttributeValue (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+long accessibilityAttributeValue (long id, long sel, long arg0) {
 	NSString nsAttributeName = new NSString(arg0);
-	long /*int*/ superValue = super.accessibilityAttributeValue(id, sel, arg0);
+	long superValue = super.accessibilityAttributeValue(id, sel, arg0);
 
 	if ((state & CANVAS) != 0) {
 		// If this Composite has an Accessible that defined a role, return that, unless the
@@ -185,7 +185,7 @@ long /*int*/ accessibilityAttributeValue (long /*int*/ id, long /*int*/ sel, lon
 
 
 @Override
-boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
+boolean accessibilityIsIgnored(long id, long sel) {
 	if (id == accessibleHandle()) {
 		// If a Composite or subclass has an Accessible it should not be ignored.
 		if (accessible != null) return accessible.internal_accessibilityIsIgnored(ACC.CHILDID_SELF);
@@ -347,7 +347,7 @@ public void drawBackground(GC gc, int x, int y, int width, int height, int offse
 }
 
 @Override
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rect) {
 	if (id != view.id) return;
 	if ((state & CANVAS) != 0) {
 		if ((style & SWT.NO_BACKGROUND) == 0) {
@@ -565,7 +565,7 @@ public boolean isLayoutDeferred () {
 }
 
 @Override
-boolean isOpaque (long /*int*/ id, long /*int*/ sel) {
+boolean isOpaque (long id, long sel) {
 	if ((state & CANVAS) != 0) {
 		if (id == view.id) {
 			return region == null && isOpaque();
@@ -594,7 +594,7 @@ boolean isTabGroup () {
 }
 
 @Override
-void keyDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void keyDown (long id, long sel, long theEvent) {
 	if (hasFocus()) {
 		if ((state & CANVAS) != 0) {
 			Shell s = this.getShell();
@@ -925,25 +925,25 @@ Point minimumSize (int wHint, int Hint, boolean changed) {
 }
 
 @Override
-boolean mouseEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent, int type) {
+boolean mouseEvent (long id, long sel, long theEvent, int type) {
 	boolean result = super.mouseEvent (id, sel, theEvent, type);
 	return (state & CANVAS) == 0 ? result : new NSEvent (theEvent).type () != OS.NSLeftMouseDown;
 }
 
 @Override
-void pageDown(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
+void pageDown(long id, long sel, long sender) {
 	if ((state & CANVAS) != 0) return;
 	super.pageDown(id, sel, sender);
 }
 
 @Override
-void pageUp(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
+void pageUp(long id, long sel, long sender) {
 	if ((state & CANVAS) != 0) return;
 	super.pageUp(id, sel, sender);
 }
 
 @Override
-void reflectScrolledClipView (long /*int*/ id, long /*int*/ sel, long /*int*/ aClipView) {
+void reflectScrolledClipView (long id, long sel, long aClipView) {
 	if ((state & CANVAS) != 0) return;
 	super.reflectScrolledClipView (id, sel, aClipView);
 }
@@ -992,15 +992,15 @@ void resized () {
 }
 
 @Override
-void scrollWheel (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void scrollWheel (long id, long sel, long theEvent) {
 	if ((state & CANVAS) != 0) {
 		NSView view = scrollView != null ? scrollView : this.view;
 		if (id == view.id) {
 			getShell().deferFlushing();
 			NSEvent nsEvent = new NSEvent(theEvent);
 			boolean handled = false;
-			double /*float*/ deltaY = nsEvent.deltaY();
-			double /*float*/ deltaX = nsEvent.deltaX ();
+			double deltaY = nsEvent.deltaY();
+			double deltaX = nsEvent.deltaX ();
 			if ((hooks(SWT.Gesture) || filters (SWT.Gesture))) {
 				if (deltaX != 0 || deltaY != 0) {
 					if (!gestureEvent(id, theEvent, SWT.GESTURE_PAN)) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
index cba8bccc1b..dad990baa4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
@@ -63,13 +63,13 @@ public abstract class Control extends Widget implements Drawable {
 	Object layoutData;
 	int drawCount, backgroundAlpha = 255;
 	Menu menu;
-	double /*float*/ [] foreground, background;
+	double [] foreground, background;
 	Image backgroundImage;
 	Font font;
 	Cursor cursor;
 	Region region;
 	NSBezierPath regionPath;
-	long /*int*/ visibleRgn;
+	long visibleRgn;
 	Accessible accessible;
 	boolean inCacheDisplayInRect;
 	boolean touchEnabled;
@@ -123,15 +123,15 @@ public Control (Composite parent, int style) {
 }
 
 @Override
-boolean acceptsFirstMouse (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+boolean acceptsFirstMouse (long id, long sel, long theEvent) {
 	Shell shell = getShell ();
 	if ((shell.style & SWT.ON_TOP) != 0) return true;
 	return super.acceptsFirstMouse (id, sel, theEvent);
 }
 
 @Override
-long /*int*/ accessibleHandle() {
-	long /*int*/ returnValue = view.id;
+long accessibleHandle() {
+	long returnValue = view.id;
 
 	if (view instanceof NSControl) {
 		if (((NSControl) view).cell() != null) {
@@ -143,7 +143,7 @@ long /*int*/ accessibleHandle() {
 }
 
 @Override
-long /*int*/ accessibilityActionDescription(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+long accessibilityActionDescription(long id, long sel, long arg0) {
 	if (id == accessibleHandle() && accessible != null) {
 		NSString actionName = new NSString(arg0);
 		id returnValue = accessible.internal_accessibilityActionDescription(actionName, ACC.CHILDID_SELF);
@@ -153,8 +153,8 @@ long /*int*/ accessibilityActionDescription(long /*int*/ id, long /*int*/ sel, l
 }
 
 @Override
-long /*int*/ accessibilityActionNames(long /*int*/ id, long /*int*/ sel) {
-	long /*int*/ returnValue = super.accessibilityActionNames(id, sel);
+long accessibilityActionNames(long id, long sel) {
+	long returnValue = super.accessibilityActionNames(id, sel);
 	if (handleIsAccessible(id)) {
 		if (accessible != null) {
 			NSArray baseArray = accessible.internal_accessibilityActionNames(ACC.CHILDID_SELF);
@@ -172,9 +172,9 @@ long /*int*/ accessibilityActionNames(long /*int*/ id, long /*int*/ sel) {
 }
 
 @Override
-long /*int*/ accessibilityAttributeNames(long /*int*/ id, long /*int*/ sel) {
+long accessibilityAttributeNames(long id, long sel) {
 
-	long /*int*/ returnValue = 0;
+	long returnValue = 0;
 
 	if (handleIsAccessible(id) && accessible != null) {
 		// See if the accessible is defining the attribute set for the control.
@@ -200,12 +200,12 @@ long /*int*/ accessibilityAttributeNames(long /*int*/ id, long /*int*/ sel) {
  * or overridden by the SWT Accessible. false if the Cocoa defaults for the control should
  * be used.
  */
-boolean handleIsAccessible(long /*int*/ id) {
+boolean handleIsAccessible(long id) {
 	return id == accessibleHandle();
 }
 
 @Override
-long /*int*/ accessibilityParameterizedAttributeNames(long /*int*/ id, long /*int*/ sel) {
+long accessibilityParameterizedAttributeNames(long id, long sel) {
 
 	if (handleIsAccessible(id) && accessible != null) {
 		NSArray returnValue = accessible.internal_accessibilityParameterizedAttributeNames(ACC.CHILDID_SELF);
@@ -216,7 +216,7 @@ long /*int*/ accessibilityParameterizedAttributeNames(long /*int*/ id, long /*in
 }
 
 @Override
-void accessibilityPerformAction(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void accessibilityPerformAction(long id, long sel, long arg0) {
 	if (handleIsAccessible(id) && accessible != null) {
 		NSString action = new NSString(arg0);
 		if (accessible.internal_accessibilityPerformAction(action, ACC.CHILDID_SELF)) return;
@@ -225,7 +225,7 @@ void accessibilityPerformAction(long /*int*/ id, long /*int*/ sel, long /*int*/
 }
 
 @Override
-long /*int*/ accessibilityFocusedUIElement(long /*int*/ id, long /*int*/ sel) {
+long accessibilityFocusedUIElement(long id, long sel) {
 	id returnValue = null;
 
 	if (handleIsAccessible(id) && accessible != null) {
@@ -241,7 +241,7 @@ long /*int*/ accessibilityFocusedUIElement(long /*int*/ id, long /*int*/ sel) {
 }
 
 @Override
-long /*int*/ accessibilityHitTest(long /*int*/ id, long /*int*/ sel, NSPoint point) {
+long accessibilityHitTest(long id, long sel, NSPoint point) {
 	id returnValue = null;
 
 	if (handleIsAccessible(id) && accessible != null) {
@@ -257,9 +257,9 @@ long /*int*/ accessibilityHitTest(long /*int*/ id, long /*int*/ sel, NSPoint poi
 }
 
 @Override
-long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+long accessibilityAttributeValue(long id, long sel, long arg0) {
 	NSString attribute = new NSString(arg0);
-	long /*int*/ returnValue = 0;
+	long returnValue = 0;
 	id returnObject = null;
 
 	if (handleIsAccessible(id) && accessible != null) {
@@ -287,7 +287,7 @@ long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long
 }
 
 @Override
-long /*int*/ accessibilityAttributeValue_forParameter(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+long accessibilityAttributeValue_forParameter(long id, long sel, long arg0, long arg1) {
 	NSString attribute = new NSString(arg0);
 
 	id returnValue = null;
@@ -306,7 +306,7 @@ long /*int*/ accessibilityAttributeValue_forParameter(long /*int*/ id, long /*in
 }
 
 @Override
-boolean accessibilityIsAttributeSettable(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+boolean accessibilityIsAttributeSettable(long id, long sel, long arg0) {
 	boolean returnValue = false;
 	if (handleIsAccessible(id) && accessible != null) {
 		NSString attribute = new NSString (arg0);
@@ -319,7 +319,7 @@ boolean accessibilityIsAttributeSettable(long /*int*/ id, long /*int*/ sel, long
 }
 
 @Override
-void accessibilitySetValue_forAttribute(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+void accessibilitySetValue_forAttribute(long id, long sel, long arg0, long arg1) {
 	if (handleIsAccessible(id) && accessible != null) {
 		id value = new id(arg0);
 		NSString attribute = new NSString(arg1);
@@ -758,27 +758,27 @@ public void addTraverseListener (TraverseListener listener) {
 }
 
 @Override
-boolean becomeFirstResponder (long /*int*/ id, long /*int*/ sel) {
+boolean becomeFirstResponder (long id, long sel) {
 	if ((state & DISABLED) != 0) return false;
 	return super.becomeFirstResponder (id, sel);
 }
 
 @Override
-void beginGestureWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void beginGestureWithEvent (long id, long sel, long event) {
 	if (!gestureEvent(id, event, SWT.GESTURE_BEGIN)) return;
 	super.beginGestureWithEvent(id, sel, event);
 }
 
 @Override
-void endGestureWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void endGestureWithEvent (long id, long sel, long event) {
 	if (!gestureEvent(id, event, SWT.GESTURE_END)) return;
 	super.endGestureWithEvent(id, sel, event);
 }
 
-void calculateVisibleRegion (NSView view, long /*int*/ visibleRgn, boolean clipChildren) {
-	long /*int*/ tempRgn = OS.NewRgn ();
+void calculateVisibleRegion (NSView view, long visibleRgn, boolean clipChildren) {
+	long tempRgn = OS.NewRgn ();
 	if (!view.isHiddenOrHasHiddenAncestor() && isDrawing()) {
-		long /*int*/ childRgn = OS.NewRgn ();
+		long childRgn = OS.NewRgn ();
 		NSWindow window = view.window ();
 		NSView contentView = window.contentView();
 		NSView frameView = contentView.superview();
@@ -797,7 +797,7 @@ void calculateVisibleRegion (NSView view, long /*int*/ visibleRgn, boolean clipC
 			if (OS.EmptyRgn (visibleRgn)) break;
 			if (clipChildren || tempView.id != view.id) {
 				NSArray subviews = tempView.subviews();
-				long /*int*/ count = subviews.count();
+				long count = subviews.count();
 				for (int i = 0; i < count; i++) {
 					NSView child = new NSView (subviews.objectAtIndex(count - i - 1));
 					if (lastControl != null && child.id == lastControl.id) break;
@@ -821,7 +821,7 @@ void calculateVisibleRegion (NSView view, long /*int*/ visibleRgn, boolean clipC
 }
 
 @Override
-void cancelOperation(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
+void cancelOperation(long id, long sel, long sender) {
 	// Cmd-. and escape arrive here. Forward the current event as a key event.
 	if (hasKeyboardFocus(id)) {
 		NSEvent nsEvent = NSApplication.sharedApplication().currentEvent();
@@ -981,7 +981,7 @@ NSView contentView () {
 	return view;
 }
 
-NSAttributedString createString (String string, Font font, double /*float*/ [] foreground, int alignment, boolean wrap, boolean enabled, boolean mnemonics) {
+NSAttributedString createString (String string, Font font, double [] foreground, int alignment, boolean wrap, boolean enabled, boolean mnemonics) {
 	NSMutableDictionary dict = ((NSMutableDictionary)new NSMutableDictionary().alloc()).initWithCapacity(5);
 	if (font == null) font = this.font != null ? this.font : defaultFont();
 	dict.setObject (font.handle, OS.NSFontAttributeName);
@@ -1070,7 +1070,7 @@ void destroyWidget () {
 }
 
 @Override
-void doCommandBySelector (long /*int*/ id, long /*int*/ sel, long /*int*/ selector) {
+void doCommandBySelector (long id, long sel, long selector) {
 	if (hasKeyboardFocus(id)) {
 		if (imeInComposition ()) return;
 		Shell s = this.getShell();
@@ -1084,7 +1084,7 @@ void doCommandBySelector (long /*int*/ id, long /*int*/ sel, long /*int*/ select
 			 * during this keystroke. This rule does not apply if the command key
 			 * is down, because we likely triggered the current key sequence via flagsChanged.
 			 */
-			long /*int*/ modifiers = nsEvent.modifierFlags();
+			long modifiers = nsEvent.modifierFlags();
 			if (s.keyInputHappened == false || (modifiers & OS.NSCommandKeyMask) != 0) {
 				s.keyInputHappened = true;
 				boolean [] consume = new boolean [1];
@@ -1198,9 +1198,9 @@ boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
 	 */
 	NSApplication application = NSApplication.sharedApplication();
 	boolean dragging = false;
-	long /*int*/ eventType = OS.NSLeftMouseDown;
-	double /*float*/ dragX = x;
-	double /*float*/ dragY = y;
+	long eventType = OS.NSLeftMouseDown;
+	double dragX = x;
+	double dragY = y;
 
 	/**
 	 * To check for an actual drag we need to pull off mouse moved and mouse up events
@@ -1261,7 +1261,7 @@ boolean drawsBackground() {
 }
 
 @Override
-void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawWidget (long id, NSGraphicsContext context, NSRect rect) {
 	if (id != paintView().id) return;
 	if (!hooks (SWT.Paint) && !filters (SWT.Paint)) return;
 
@@ -1287,7 +1287,7 @@ void enableWidget (boolean enabled) {
 	updateCursorRects (isEnabled ());
 }
 
-boolean equals(double /*float*/ [] color1, double /*float*/ [] color2) {
+boolean equals(double [] color1, double [] color2) {
 	if (color1 == color2) return true;
 	if (color1 == null) return color2 == null;
 	if (color2 == null) return color1 == null;
@@ -1339,8 +1339,8 @@ void fillBackground (NSView view, NSGraphicsContext context, NSRect rect, int im
 		return;
 	}
 
-	double /*float*/ [] background = control.background;
-	double /*float*/ alpha;
+	double [] background = control.background;
+	double alpha;
 	if (background == null) {
 		if (isTransparent()) return;
 		background = control.defaultBackground ().handle;
@@ -1393,14 +1393,14 @@ void fixFocus (Control focusControl) {
 }
 
 @Override
-void flagsChanged (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void flagsChanged (long id, long sel, long theEvent) {
 	if (hasKeyboardFocus(id)) {
 		if ((state & WEBKIT_EVENTS_FIX) == 0) {
 			Shell s = this.getShell();
 			s.keyInputHappened = false;
 			int mask = 0;
 			NSEvent nsEvent = new NSEvent (theEvent);
-			long /*int*/ modifiers = nsEvent.modifierFlags ();
+			long modifiers = nsEvent.modifierFlags ();
 			int keyCode = Display.translateKey (nsEvent.keyCode ());
 			switch (keyCode) {
 				case SWT.ALT: mask = OS.NSAlternateKeyMask; break;
@@ -1480,7 +1480,7 @@ boolean forceFocus (NSView focusView) {
 	return window.makeFirstResponder (focusView);
 }
 
-boolean gestureEvent(long /*int*/ id, long /*int*/ eventPtr, int detail) {
+boolean gestureEvent(long id, long eventPtr, int detail) {
 	if (!display.sendEvent) return true;
 	display.sendEvent = false;
 	// For cross-platform compatibility, touch events and gestures are mutually exclusive.
@@ -1906,7 +1906,7 @@ NSBezierPath getPath(Region region) {
 	return getPath(region.handle);
 }
 
-NSBezierPath getPath(long /*int*/ region) {
+NSBezierPath getPath(long region) {
 	Callback callback = new Callback(this, "regionToRects", 4);
 	if (callback.getAddress() == 0) error(SWT.ERROR_NO_MORE_CALLBACKS);
 	NSBezierPath path = NSBezierPath.bezierPath();
@@ -2060,12 +2060,12 @@ public boolean getVisible () {
 	return (state & HIDDEN) == 0;
 }
 
-long /*int*/ getVisibleRegion () {
+long getVisibleRegion () {
 	if (visibleRgn == 0) {
 		visibleRgn = OS.NewRgn ();
 		calculateVisibleRegion (view, visibleRgn, true);
 	}
-	long /*int*/ result = OS.NewRgn ();
+	long result = OS.NewRgn ();
 	OS.CopyRgn (visibleRgn, result);
 	return result;
 }
@@ -2083,7 +2083,7 @@ boolean hasRegion () {
 }
 
 @Override
-long /*int*/ hitTest (long /*int*/ id, long /*int*/ sel, NSPoint point) {
+long hitTest (long id, long sel, NSPoint point) {
 	if ((state & DISABLED) != 0) return 0;
 	if (!isActive ()) return 0;
 	if (regionPath != null) {
@@ -2100,7 +2100,7 @@ boolean imeInComposition () {
 }
 
 @Override
-boolean insertText (long /*int*/ id, long /*int*/ sel, long /*int*/ string) {
+boolean insertText (long id, long sel, long string) {
 	// sendKeyEvent may do something to run the event loop.  That would cause
 	// 'string' to be released before any superclass could use it, so save it
 	// until this method finishes.
@@ -2111,13 +2111,13 @@ boolean insertText (long /*int*/ id, long /*int*/ sel, long /*int*/ string) {
 			Shell s = this.getShell();
 			NSEvent nsEvent = NSApplication.sharedApplication ().currentEvent ();
 			if (nsEvent != null) {
-				long /*int*/ type = nsEvent.type ();
+				long type = nsEvent.type ();
 				if (type == OS.NSKeyDown || type == OS.NSKeyUp || type == OS.NSSystemDefined) {
 					NSString str = new NSString (string);
 					if (str.isKindOfClass (OS.class_NSAttributedString)) {
 						str = new NSAttributedString (string).string ();
 					}
-					int length = (int)/*64*/str.length ();
+					int length = (int)str.length ();
 					char[] buffer = new char [length];
 					str.getCharacters(buffer);
 					for (int i = 0; i < buffer.length; i++) {
@@ -2154,7 +2154,7 @@ boolean insertText (long /*int*/ id, long /*int*/ sel, long /*int*/ string) {
  * @noreference This method is not intended to be referenced by clients.
  */
 @Override
-public long /*int*/ internal_new_GC (GCData data) {
+public long internal_new_GC (GCData data) {
 	checkWidget();
 	NSView view = paintView();
 	NSGraphicsContext graphicsContext = null;
@@ -2169,7 +2169,7 @@ public long /*int*/ internal_new_GC (GCData data) {
 		 * to create a GC on a deferred NSWindow.
 		 */
 		if (window.windowNumber() <= 0) {
-			double /*float*/ alpha = window.alphaValue();
+			double alpha = window.alphaValue();
 			window.setAlphaValue(0);
 			window.orderBack(null);
 			window.orderOut(null);
@@ -2223,9 +2223,9 @@ public long /*int*/ internal_new_GC (GCData data) {
  * @noreference This method is not intended to be referenced by clients.
  */
 @Override
-public void internal_dispose_GC (long /*int*/ hDC, GCData data) {
+public void internal_dispose_GC (long hDC, GCData data) {
 	checkWidget ();
-	long /*int*/ context = hDC;
+	long context = hDC;
 	NSGraphicsContext graphicsContext = new NSGraphicsContext (context);
 	display.removeContext (data);
 	if (data != null) {
@@ -2332,7 +2332,7 @@ public boolean isFocusControl () {
 }
 
 boolean isObscured () {
-	long /*int*/ visibleRgn = getVisibleRegion(), boundsRgn = OS.NewRgn();
+	long visibleRgn = getVisibleRegion(), boundsRgn = OS.NewRgn();
 	short[] rect = new short[4];
 	NSRect bounds = view.visibleRect();
 	OS.SetRect(rect, (short)bounds.x, (short)bounds.y, (short)(bounds.x + bounds.width), (short)(bounds.y + bounds.height));
@@ -2433,7 +2433,7 @@ public boolean isVisible () {
 }
 
 @Override
-void keyDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void keyDown (long id, long sel, long theEvent) {
 	if (hasKeyboardFocus(id)) {
 		Shell s = this.getShell();
 		s.keyInputHappened = false;
@@ -2467,12 +2467,12 @@ void keyDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 	super.keyDown (id, sel, theEvent);
 }
 
-boolean hasKeyboardFocus(long /*int*/ inId) {
+boolean hasKeyboardFocus(long inId) {
 	return view.window().firstResponder().id == inId;
 }
 
 @Override
-void keyUp (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void keyUp (long id, long sel, long theEvent) {
 	if (hasKeyboardFocus(id)) {
 		NSEvent nsEvent = new NSEvent (theEvent);
 		if (!sendKeyEvent (nsEvent, SWT.KeyUp)) return;
@@ -2481,7 +2481,7 @@ void keyUp (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-void magnifyWithEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void magnifyWithEvent(long id, long sel, long event) {
 	if (!gestureEvent(id, event, SWT.GESTURE_MAGNIFY)) return;
 	super.magnifyWithEvent(id, sel, event);
 }
@@ -2491,7 +2491,7 @@ void markLayout (boolean changed, boolean all) {
 }
 
 @Override
-long /*int*/ menuForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+long menuForEvent (long id, long sel, long theEvent) {
 	if (display.lastHandledMenuForEventId == theEvent) return 0;
 	display.lastHandledMenuForEventId = theEvent;
 	if (!isEnabled ()) return 0;
@@ -2525,7 +2525,7 @@ Decorations menuShell () {
 }
 
 @Override
-void scrollWheel (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void scrollWheel (long id, long sel, long theEvent) {
 	boolean handled = false;
 	if (id == view.id) {
 		NSEvent nsEvent = new NSEvent(theEvent);
@@ -2556,18 +2556,18 @@ void scrollWheel (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 	if (!handled) super.scrollWheel(id, sel, theEvent);
 }
 
-boolean isEventView (long /*int*/ id) {
+boolean isEventView (long id) {
 	return true;
 }
 
-boolean mouseEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent, int type) {
+boolean mouseEvent (long id, long sel, long theEvent, int type) {
 	if (!display.sendEvent) return true;
 	display.sendEvent = false;
 	if (!isEventView (id)) return true;
 	boolean dragging = false;
 	boolean[] consume = null;
 	NSEvent nsEvent = new NSEvent(theEvent);
-	int nsType = (int)/*64*/nsEvent.type();
+	int nsType = (int)nsEvent.type();
 	NSInputManager manager = NSInputManager.currentInputManager ();
 	if (manager != null && manager.wantsToHandleMouseEvents ()) {
 		if (manager.handleMouseEvent (nsEvent)) {
@@ -2613,7 +2613,7 @@ boolean mouseEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent, in
 }
 
 @Override
-void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDown(long id, long sel, long theEvent) {
 	if (!mouseEvent(id, sel, theEvent, SWT.MouseDown)) return;
 	boolean tracking = isEventView (id);
 	Display display = this.display;
@@ -2623,49 +2623,49 @@ void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseUp(long id, long sel, long theEvent) {
 	if (!mouseEvent(id, sel, theEvent, SWT.MouseUp)) return;
 	super.mouseUp(id, sel, theEvent);
 }
 
 @Override
-void mouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDragged(long id, long sel, long theEvent) {
 	if (!mouseEvent(id, sel, theEvent, SWT.MouseMove)) return;
 	super.mouseDragged(id, sel, theEvent);
 }
 
 @Override
-void rightMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void rightMouseDown(long id, long sel, long theEvent) {
 	if (!mouseEvent(id, sel, theEvent, SWT.MouseDown)) return;
 	super.rightMouseDown(id, sel, theEvent);
 }
 
 @Override
-void rightMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void rightMouseUp(long id, long sel, long theEvent) {
 	if (!mouseEvent(id, sel, theEvent, SWT.MouseUp)) return;
 	super.rightMouseUp(id, sel, theEvent);
 }
 
 @Override
-void rightMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void rightMouseDragged(long id, long sel, long theEvent) {
 	if (!mouseEvent(id, sel, theEvent, SWT.MouseMove)) return;
 	super.rightMouseDragged(id, sel, theEvent);
 }
 
 @Override
-void otherMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void otherMouseDown(long id, long sel, long theEvent) {
 	if (!mouseEvent(id, sel, theEvent, SWT.MouseDown)) return;
 	super.otherMouseDown(id, sel, theEvent);
 }
 
 @Override
-void otherMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void otherMouseUp(long id, long sel, long theEvent) {
 	if (!mouseEvent(id, sel, theEvent, SWT.MouseUp)) return;
 	super.otherMouseUp(id, sel, theEvent);
 }
 
 @Override
-void otherMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void otherMouseDragged(long id, long sel, long theEvent) {
 	if (!mouseEvent(id, sel, theEvent, SWT.MouseMove)) return;
 	super.otherMouseDragged(id, sel, theEvent);
 }
@@ -2918,7 +2918,7 @@ public void redraw (int x, int y, int width, int height, boolean all) {
 	view.setNeedsDisplayInRect(rect);
 }
 
-long /*int*/ regionToRects(long /*int*/ message, long /*int*/ rgn, long /*int*/ r, long /*int*/ path) {
+long regionToRects(long message, long rgn, long r, long path) {
 	NSPoint pt = new NSPoint();
 	short[] rect = new short[4];
 	if (message == OS.kQDRegionToRectsMsgParse) {
@@ -3381,7 +3381,7 @@ void resetVisibleRegion () {
 	}
 	GCData[] gcs = display.contexts;
 	if (gcs != null) {
-		long /*int*/ visibleRgn = 0;
+		long visibleRgn = 0;
 		for (int i=0; i<gcs.length; i++) {
 			GCData data = gcs [i];
 			if (data != null) {
@@ -3401,7 +3401,7 @@ void resized () {
 }
 
 @Override
-void rotateWithEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void rotateWithEvent(long id, long sel, long event) {
 	if (!gestureEvent(id, event, SWT.GESTURE_ROTATE)) return;
 	super.rotateWithEvent(id, sel, event);
 }
@@ -3457,7 +3457,7 @@ boolean sendMouseEvent (NSEvent nsEvent, int type, boolean send) {
 		case SWT.MouseUp:
 		case SWT.MouseDoubleClick:
 		case SWT.DragDetect:
-			int button = (int)/*64*/nsEvent.buttonNumber();
+			int button = (int)nsEvent.buttonNumber();
 			switch (button) {
 				case 0: event.button = 1; break;
 				case 1: event.button = 3; break;
@@ -3468,12 +3468,12 @@ boolean sendMouseEvent (NSEvent nsEvent, int type, boolean send) {
 			break;
 		case SWT.MouseWheel: {
 			event.detail = SWT.SCROLL_LINE;
-			double /*float*/ delta = nsEvent.deltaY();
+			double delta = nsEvent.deltaY();
 			event.count = delta > 0 ? Math.max (1, (int)delta) : Math.min (-1, (int)delta);
 			break;
 		}
 		case SWT.MouseHorizontalWheel: {
-			double /*float*/ delta = nsEvent.deltaX();
+			double delta = nsEvent.deltaX();
 			event.count = delta > 0 ? Math.max (1, (int)delta) : Math.min (-1, (int)delta);
 			break;
 		}
@@ -3506,7 +3506,7 @@ boolean sendMouseEvent (NSEvent nsEvent, int type, boolean send) {
 
 Touch touchStateFromNSTouch(NSTouch touch) {
 	TouchSource source = display.findTouchSource(touch);
-	long /*int*/ osPhase = touch.phase();
+	long osPhase = touch.phase();
 	long identity = OS.objc_msgSend(touch.id, OS.sel_identity);
 	int state = 0;
 
@@ -3538,8 +3538,8 @@ Touch touchStateFromNSTouch(NSTouch touch) {
 }
 
 NSTouch findTouchWithId(NSArray touches, NSObject identity) {
-	long /*int*/ count = touches.count();
-	for (long /*int*/ i = 0; i < count; i++) {
+	long count = touches.count();
+	for (long i = 0; i < count; i++) {
 		NSTouch aTouch = new NSTouch(touches.objectAtIndex(i).id);
 		NSObject currIdentity = new NSObject(OS.objc_msgSend(aTouch.id, OS.sel_identity));
 		if (currIdentity.isEqual(identity)) return aTouch;
@@ -3554,7 +3554,7 @@ void setBackground () {
 	if (control.backgroundImage != null) {
 		setBackgroundImage (control.backgroundImage.handle);
 	} else {
-		double /*float*/ [] color = control.background != null ? control.background : control.defaultBackground().handle;
+		double [] color = control.background != null ? control.background : control.defaultBackground().handle;
 		NSColor nsColor = NSColor.colorWithDeviceRed(color[0], color[1], color[2], color[3]);
 		setBackgroundColor (nsColor);
 	}
@@ -3589,7 +3589,7 @@ private void _setBackground (Color color) {
 	if (color != null) {
 		if (color.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
 	}
-	double /*float*/ [] background = color != null ? color.handle : null;
+	double [] background = color != null ? color.handle : null;
 	int alpha = color != null ? color.getAlpha() : 255;
 	if (equals (background, this.background) && alpha == this.backgroundAlpha) return;
 	this.background = background;
@@ -3924,18 +3924,18 @@ public void setForeground (Color color) {
 	if (color != null) {
 		if (color.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
 	}
-	double /*float*/ [] foreground = color != null ? color.handle : null;
+	double [] foreground = color != null ? color.handle : null;
 	if (equals (foreground, this.foreground)) return;
 	this.foreground = foreground;
 	setForeground (foreground);
 	redrawWidget (view, false);
 }
 
-void setForeground (double /*float*/ [] color) {
+void setForeground (double [] color) {
 }
 
 @Override
-void setFrameOrigin (long /*int*/ id, long /*int*/ sel, NSPoint point) {
+void setFrameOrigin (long id, long sel, NSPoint point) {
 	NSView topView = topView ();
 	if (topView.id != id) {
 		super.setFrameOrigin(id, sel, point);
@@ -3950,7 +3950,7 @@ void setFrameOrigin (long /*int*/ id, long /*int*/ sel, NSPoint point) {
 }
 
 @Override
-void setFrameSize (long /*int*/ id, long /*int*/ sel, NSSize size) {
+void setFrameSize (long id, long sel, NSSize size) {
 	NSView topView = topView ();
 	if (topView.id != id) {
 		super.setFrameSize(id, sel, size);
@@ -4443,7 +4443,7 @@ void setZOrder () {
 }
 
 @Override
-boolean shouldDelayWindowOrderingForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+boolean shouldDelayWindowOrderingForEvent (long id, long sel, long theEvent) {
 	Shell shell = getShell ();
 	if ((shell.style & SWT.ON_TOP) != 0) return false;
 	return super.shouldDelayWindowOrderingForEvent (id, sel, theEvent);
@@ -4537,7 +4537,7 @@ void sort (int [] items) {
 }
 
 @Override
-void swipeWithEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void swipeWithEvent(long id, long sel, long event) {
 	if (!gestureEvent(id, event, SWT.GESTURE_SWIPE)) return;
 	super.swipeWithEvent(id, sel, event);
 }
@@ -4660,7 +4660,7 @@ NSView topView () {
 	return view;
 }
 
-boolean touchEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ eventPtr) {
+boolean touchEvent(long id, long sel, long eventPtr) {
 	if (!display.sendEvent) return true;
 	display.sendEvent = false;
 	if (!(hooks(SWT.Touch) || filters(SWT.Touch))) return true;
@@ -4677,8 +4677,8 @@ boolean touchEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ eventPtr) {
 	event.y = (int) location.y;
 	setInputState (event, nsEvent, SWT.Touch);
 	NSSet allTouchesSet = nsEvent.touchesMatchingPhase(OS.NSTouchPhaseAny, null);
-	long /*int*/ touchCount = allTouchesSet.count();
-	Touch touches[] = new Touch[(int)/*64*/touchCount];
+	long touchCount = allTouchesSet.count();
+	Touch touches[] = new Touch[(int)touchCount];
 	int currTouchIndex = 0;
 
 	// Process removed/cancelled touches first.
@@ -4711,7 +4711,7 @@ boolean touchEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ eventPtr) {
 		 * if a 4-finger gesture occurs and the application switcher appears. Workaround is to generate a TOUCHSTATE_UP for the
 		 * orphaned touch.
 		 */
-		for (long /*int*/ j = currentTouches.count() - 1; j >= 0 ; j--) {
+		for (long j = currentTouches.count() - 1; j >= 0 ; j--) {
 			NSTouch touch = new NSTouch(currentTouches.objectAtIndex(j).id);
 			NSObject identity = new NSObject(OS.objc_msgSend(touch.id, OS.sel_identity));
 			NSTouch activeTouch = findTouchWithId(activeTouches, identity);
@@ -4737,25 +4737,25 @@ boolean touchEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ eventPtr) {
 }
 
 @Override
-void touchesBeganWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void touchesBeganWithEvent (long id, long sel, long event) {
 	if (!touchEvent(id, sel, event)) return;
 	super.touchesBeganWithEvent(id, sel, event);
 }
 
 @Override
-void touchesCancelledWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void touchesCancelledWithEvent (long id, long sel, long event) {
 	if (!touchEvent(id, sel, event)) return;
 	super.touchesCancelledWithEvent(id, sel, event);
 }
 
 @Override
-void touchesEndedWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void touchesEndedWithEvent (long id, long sel, long event) {
 	if (!touchEvent(id, sel, event)) return;
 	super.touchesEndedWithEvent(id, sel, event);
 }
 
 @Override
-void touchesMovedWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void touchesMovedWithEvent (long id, long sel, long event) {
 	if (!touchEvent(id, sel, event)) return;
 	super.touchesMovedWithEvent(id, sel, event);
 }
@@ -4777,7 +4777,7 @@ boolean translateTraversal (int key, NSEvent theEvent, boolean [] consume) {
 			break;
 		}
 		case 48: /* Tab */ {
-			long /*int*/ modifiers = theEvent.modifierFlags ();
+			long modifiers = theEvent.modifierFlags ();
 			boolean next = (modifiers & OS.NSShiftKeyMask) == 0;
 			detail = next ? SWT.TRAVERSE_TAB_NEXT : SWT.TRAVERSE_TAB_PREVIOUS;
 			break;
@@ -4793,7 +4793,7 @@ boolean translateTraversal (int key, NSEvent theEvent, boolean [] consume) {
 		case 116: /* Page up */
 		case 121: /* Page down */ {
 			all = true;
-			long /*int*/ modifiers = theEvent.modifierFlags ();
+			long modifiers = theEvent.modifierFlags ();
 			if ((modifiers & OS.NSControlKeyMask) == 0) return false;
 			detail = key == 121 /* Page down */ ? SWT.TRAVERSE_PAGE_NEXT : SWT.TRAVERSE_PAGE_PREVIOUS;
 			break;
@@ -5139,7 +5139,7 @@ void update (boolean all) {
 //	checkWidget();
 	NSArray isPainting = display.isPainting;
 	if (isPainting.containsObject(view)) return;
-	for (int i = 0, length = (int)/*64*/isPainting.count(); i < length; i++) {
+	for (int i = 0, length = (int)isPainting.count(); i < length; i++) {
 		NSView view = new NSView(isPainting.objectAtIndex(i));
 		if (view.isDescendantOf(this.view)) return;
 	}
@@ -5164,7 +5164,7 @@ void update (boolean all) {
 void updateBackgroundColor () {
 	Control control = findBackgroundControl ();
 	if (control == null) control = this;
-	double /*float*/ [] color = control.background != null ? control.background : control.defaultBackground().handle;
+	double [] color = control.background != null ? control.background : control.defaultBackground().handle;
 	NSColor nsColor = NSColor.colorWithDeviceRed(color[0], color[1], color[2], color[3]);
 	setBackgroundColor (nsColor);
 }
@@ -5184,12 +5184,12 @@ void updateBackgroundMode () {
 }
 
 @Override
-void resetCursorRects (long /*int*/ id, long /*int*/ sel) {
+void resetCursorRects (long id, long sel) {
 	if (isEnabled ()) callSuper (id, sel);
 }
 
 @Override
-void updateTrackingAreas (long /*int*/ id, long /*int*/ sel) {
+void updateTrackingAreas (long id, long sel) {
 	if (isEnabled ()) callSuper (id, sel);
 }
 
@@ -5214,7 +5214,7 @@ void updateLayout (boolean all) {
 	/* Do nothing */
 }
 
-static double /*float*/ calcDiff (double /*float*/ component, double /*float*/ factor, boolean wantDarker) {
+static double calcDiff (double component, double factor, boolean wantDarker) {
 	if (wantDarker) {
 		return component * -1 * factor;
 	} else {
@@ -5222,14 +5222,14 @@ static double /*float*/ calcDiff (double /*float*/ component, double /*float*/ f
 	}
 }
 
-static double /*float*/ [] getLighterOrDarkerColor (double /*float*/ [] pixel, double /*float*/ factor, boolean wantDarker) {
-	double /*float*/ red = pixel[0];
-	double /*float*/ green = pixel[1];
-	double /*float*/ blue = pixel[2];
+static double [] getLighterOrDarkerColor (double [] pixel, double factor, boolean wantDarker) {
+	double red = pixel[0];
+	double green = pixel[1];
+	double blue = pixel[2];
 	red += calcDiff(red, factor, wantDarker);
 	green += calcDiff(green, factor, wantDarker);
 	blue += calcDiff(blue, factor, wantDarker);
-	return new double /*float*/ [] { red, green, blue, pixel[3] };
+	return new double [] { red, green, blue, pixel[3] };
 }
 
 /**
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java
index 54fdeaab02..5ab9e43cb4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java
@@ -282,7 +282,7 @@ void disposePopupShell() {
 }
 
 @Override
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rect) {
 	if (id != view.id) return;
 	fillBackground (view, context, rect, -1);
 }
@@ -359,7 +359,7 @@ public Control [] getChildren () {
  */
 public int getDay () {
 	checkWidget ();
-	return (int)/*64*/getCalendarDate().dayOfMonth();
+	return (int)getCalendarDate().dayOfMonth();
 }
 
 /**
@@ -377,7 +377,7 @@ public int getDay () {
  */
 public int getHours () {
 	checkWidget ();
-	return (int)/*64*/getCalendarDate().hourOfDay();
+	return (int)getCalendarDate().hourOfDay();
 }
 
 /**
@@ -395,7 +395,7 @@ public int getHours () {
  */
 public int getMinutes () {
 	checkWidget ();
-	return (int)/*64*/getCalendarDate().minuteOfHour();
+	return (int)getCalendarDate().minuteOfHour();
 }
 
 /**
@@ -413,7 +413,7 @@ public int getMinutes () {
  */
 public int getMonth () {
 	checkWidget ();
-	return (int)/*64*/getCalendarDate().monthOfYear() - 1;
+	return (int)getCalendarDate().monthOfYear() - 1;
 }
 
 @Override
@@ -437,7 +437,7 @@ String getNameText() {
  */
 public int getSeconds () {
 	checkWidget ();
-	return (int)/*64*/getCalendarDate().secondOfMinute();
+	return (int)getCalendarDate().secondOfMinute();
 }
 
 /**
@@ -455,7 +455,7 @@ public int getSeconds () {
  */
 public int getYear () {
 	checkWidget ();
-	return (int)/*64*/getCalendarDate().yearOfCommonEra();
+	return (int)getCalendarDate().yearOfCommonEra();
 }
 
 boolean isDropped () {
@@ -463,18 +463,18 @@ boolean isDropped () {
 }
 
 @Override
-boolean isEventView (long /*int*/ id) {
+boolean isEventView (long id) {
 	return true;
 }
 
 @Override
-boolean isFlipped (long /*int*/ id, long /*int*/ sel) {
+boolean isFlipped (long id, long sel) {
 	if ((style & SWT.CALENDAR) != 0) return super.isFlipped (id, sel);
 	return true;
 }
 
 @Override
-void keyDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void keyDown(long id, long sel, long theEvent) {
 	if ((style & SWT.DROP_DOWN) != 0) {
 		NSEvent nsEvent = new NSEvent (theEvent);
 		int keyCode = Display.translateKey (nsEvent.keyCode ());
@@ -676,7 +676,7 @@ public void setDay (int day) {
 }
 
 @Override
-void setForeground (double /*float*/ [] color) {
+void setForeground (double [] color) {
 	NSColor nsColor;
 	if (color == null) {
 		if ((style & SWT.CALENDAR) != 0) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
index 4137c9b67d..5d3bc1ce5b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
@@ -175,7 +175,7 @@ public class Display extends Device {
 	boolean escAsAcceleratorPresent = false;
 
 	NSApplication application;
-	long /*int*/ applicationClass;
+	long applicationClass;
 	NSImage dockImage;
 	boolean isEmbedded;
 	static boolean launched = false;
@@ -193,12 +193,12 @@ public class Display extends Device {
 	int[] screenID = new int[32];
 	NSPoint[] screenCascade = new NSPoint[32];
 
-	long /*int*/ runLoopObserver;
+	long runLoopObserver;
 	Callback observerCallback;
 
 	boolean lockCursor = true;
 	static final String LOCK_CURSOR = "org.eclipse.swt.internal.lockCursor"; //$NON-NLS-1$
-	long /*int*/ oldCursorSetProc;
+	long oldCursorSetProc;
 	Callback cursorSetCallback;
 
 	Combo currentCombo;
@@ -233,9 +233,9 @@ public class Display extends Device {
 	Cursor [] cursors = new Cursor [SWT.CURSOR_HAND + 1];
 
 	/* System Colors */
-	double /*float*/ [][] colors;
-	double /*float*/ [] alternateSelectedControlTextColor, selectedControlTextColor;
-	double /*float*/ [] alternateSelectedControlColor, secondarySelectedControlColor;
+	double [][] colors;
+	double [] alternateSelectedControlTextColor, selectedControlTextColor;
+	double [] alternateSelectedControlColor, secondarySelectedControlColor;
 
 	/* Key Mappings. */
 	static int [] [] KeyTable = {
@@ -570,7 +570,7 @@ void addSkinnableWidget (Widget widget) {
 
 void addWidget (NSObject view, Widget widget) {
 	if (view == null) return;
-	long /*int*/ ivar = OS.object_setInstanceVariable (view.id, SWT_OBJECT, widget.jniRef);
+	long ivar = OS.object_setInstanceVariable (view.id, SWT_OBJECT, widget.jniRef);
 
 	if (ivar == 0) {
 		if (dynamicObjectMap == null) {
@@ -878,7 +878,7 @@ void createDisplay (DeviceData data) {
 	int [] psn = new int [2];
 	if (OS.GetCurrentProcess (psn) == OS.noErr) {
 		int pid = OS.getpid ();
-		long /*int*/ ptr = getApplicationName().UTF8String();
+		long ptr = getApplicationName().UTF8String();
 		if (ptr != 0) OS.CPSSetProcessName (psn, ptr);
 		if (!isBundled ()) {
 			if (OS.VERSION_MMB >= OS.VERSION_MMB (10, 9, 0)) {
@@ -897,20 +897,20 @@ void createDisplay (DeviceData data) {
 	}
 
 	String className = "SWTApplication";
-	long /*int*/ cls;
+	long cls;
 	if ((cls = OS.objc_lookUpClass (className)) == 0) {
 		Class clazz = getClass();
 		applicationCallback2 = new Callback(clazz, "applicationProc", 2);
-		long /*int*/ proc2 = applicationCallback2.getAddress();
+		long proc2 = applicationCallback2.getAddress();
 		if (proc2 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 		applicationCallback3 = new Callback(clazz, "applicationProc", 3);
-		long /*int*/ proc3 = applicationCallback3.getAddress();
+		long proc3 = applicationCallback3.getAddress();
 		if (proc3 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 		applicationCallback4 = new Callback(clazz, "applicationProc", 4);
-		long /*int*/ proc4 = applicationCallback4.getAddress();
+		long proc4 = applicationCallback4.getAddress();
 		if (proc4 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 		applicationCallback6 = new Callback(clazz, "applicationProc", 6);
-		long /*int*/ proc6 = applicationCallback6.getAddress();
+		long proc6 = applicationCallback6.getAddress();
 		if (proc6 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 		long superClassID = OS.object_getClass(application.id);
 		if (new NSObject(superClassID).className().getString().equals("NSKVONotifying_NSApplication")) {
@@ -937,9 +937,9 @@ void createDisplay (DeviceData data) {
 
 	className = "SWTApplicationDelegate";
 	if (OS.objc_lookUpClass (className) == 0) {
-		long /*int*/ appProc3 = applicationCallback3.getAddress();
+		long appProc3 = applicationCallback3.getAddress();
 		if (appProc3 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
-		long /*int*/ appProc4 = applicationCallback4.getAddress();
+		long appProc4 = applicationCallback4.getAddress();
 		if (appProc4 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 		cls = OS.objc_allocateClassPair(OS.class_NSObject, className, 0);
 		OS.class_addMethod(cls, OS.sel_applicationWillFinishLaunching_, appProc3, "@:@");
@@ -1043,7 +1043,7 @@ NSMutableArray currentTouches() {
 	return currentTouches;
 }
 
-long /*int*/ cursorSetProc (long /*int*/ id, long /*int*/ sel) {
+long cursorSetProc (long id, long sel) {
 	if (lockCursor) {
 		if (currentControl != null) {
 			Cursor cursor = currentControl.findCursor ();
@@ -1153,7 +1153,7 @@ boolean filters (int eventType) {
  *
  * @noreference This method is not intended to be referenced by clients.
  */
-public Widget findWidget (long /*int*/ handle) {
+public Widget findWidget (long handle) {
 	checkDevice ();
 	return getWidget (handle);
 }
@@ -1182,7 +1182,7 @@ public Widget findWidget (long /*int*/ handle) {
  *
  * @since 3.1
  */
-public Widget findWidget (long /*int*/ handle, long /*int*/ id) {
+public Widget findWidget (long handle, long id) {
 	checkDevice ();
 	return getWidget (handle);
 }
@@ -1206,7 +1206,7 @@ public Widget findWidget (long /*int*/ handle, long /*int*/ id) {
  *
  * @since 3.3
  */
-public Widget findWidget (Widget widget, long /*int*/ id) {
+public Widget findWidget (Widget widget, long id) {
 	checkDevice ();
 	return null;
 }
@@ -1322,14 +1322,14 @@ Rectangle getBounds (NSArray screens) {
 
 	NSScreen screen = new NSScreen(screens.objectAtIndex(0));
 	NSRect primaryFrame = screen.frame();
-	double /*float*/ minX = Float.MAX_VALUE, maxX = Float.MIN_VALUE;
-	double /*float*/ minY = Float.MAX_VALUE, maxY = Float.MIN_VALUE;
-	long /*int*/ count = screens.count();
+	double minX = Float.MAX_VALUE, maxX = Float.MIN_VALUE;
+	double minY = Float.MAX_VALUE, maxY = Float.MIN_VALUE;
+	long count = screens.count();
 	for (int i = 0; i < count; i++) {
 		screen = new NSScreen(screens.objectAtIndex(i));
 		NSRect frame = screen.frame();
-		double /*float*/ x1 = frame.x, x2 = frame.x + frame.width;
-		double /*float*/ y1 = primaryFrame.height - frame.y, y2 = primaryFrame.height - (frame.y + frame.height);
+		double x1 = frame.x, x2 = frame.x + frame.width;
+		double y1 = primaryFrame.height - frame.y, y2 = primaryFrame.height - (frame.y + frame.height);
 		if (x1 < minX) minX = x1;
 		if (x2 < minX) minX = x2;
 		if (x1 > maxX) maxX = x1;
@@ -1381,7 +1381,7 @@ public Rectangle getClientArea () {
 	NSScreen screen = new NSScreen(screens.objectAtIndex(0));
 	NSRect frame = screen.frame();
 	NSRect visibleFrame = screen.visibleFrame();
-	double /*float*/ y = frame.height - (visibleFrame.y + visibleFrame.height);
+	double y = frame.height - (visibleFrame.y + visibleFrame.height);
 	return new Rectangle((int)visibleFrame.x, (int)y, (int)visibleFrame.width, (int)visibleFrame.height);
 }
 
@@ -1708,7 +1708,7 @@ public Monitor [] getMonitors () {
 	if (screens == null) return new Monitor[] {};
 
 	NSRect primaryFrame = new NSScreen(screens.objectAtIndex(0)).frame();
-	int count = (int)/*64*/screens.count();
+	int count = (int)screens.count();
 	Monitor [] monitors = new Monitor [count];
 	for (int i=0; i<count; i++) {
 		Monitor monitor = new Monitor ();
@@ -1779,7 +1779,7 @@ public Shell [] getShells () {
 	checkDevice ();
 	NSArray windows = application.windows();
 	int index = 0;
-	Shell [] result = new Shell [(int)/*64*/windows.count()];
+	Shell [] result = new Shell [(int)windows.count()];
 	for (int i = 0; i < result.length; i++) {
 		NSWindow window = new NSWindow(windows.objectAtIndex(i));
 		Widget widget = getWidget(window.contentView());
@@ -1870,14 +1870,14 @@ Color getWidgetColor (int id) {
 	return null;
 }
 
-double /*float*/ [] getWidgetColorRGB (int id) {
+double [] getWidgetColorRGB (int id) {
 	NSColor color = null;
 	switch (id) {
 		case SWT.COLOR_INFO_FOREGROUND: color = NSColor.blackColor (); break;
 		case SWT.COLOR_INFO_BACKGROUND: return
 				OS.VERSION_MMB >= OS.VERSION_MMB (10, 10, 0)
-						? new double /*float*/ [] {236/255f, 235/255f, 236/255f, 1}
-						: new double /*float*/ [] {.984f, .988f, 0.773f, 1};
+						? new double [] {236/255f, 235/255f, 236/255f, 1}
+						: new double [] {.984f, .988f, 0.773f, 1};
 		case SWT.COLOR_TITLE_FOREGROUND: color = NSColor.windowFrameTextColor(); break;
 		case SWT.COLOR_TITLE_BACKGROUND: color = NSColor.alternateSelectedControlColor(); break;
 		case SWT.COLOR_TITLE_BACKGROUND_GRADIENT: color = NSColor.selectedControlColor(); break;
@@ -1887,13 +1887,13 @@ double /*float*/ [] getWidgetColorRGB (int id) {
 		case SWT.COLOR_WIDGET_DARK_SHADOW: color = NSColor.controlDarkShadowColor(); break;
 		case SWT.COLOR_WIDGET_NORMAL_SHADOW:
 			if (OS.VERSION_MMB >= OS.VERSION_MMB (10, 14, 0)) {
-				return new double /*float*/ [] {159/255f, 159/255f, 159/255f, 1};
+				return new double [] {159/255f, 159/255f, 159/255f, 1};
 			}
 			color = NSColor.controlShadowColor();
 			break;
 		case SWT.COLOR_WIDGET_LIGHT_SHADOW:
 			if (OS.VERSION_MMB >= OS.VERSION_MMB (10, 14, 0)) {
-				return new double /*float*/ [] {232/255f, 232/255f, 232/255f, 1};
+				return new double [] {232/255f, 232/255f, 232/255f, 1};
 			}
 			color = NSColor.controlHighlightColor();
 			break;
@@ -1920,16 +1920,16 @@ double /*float*/ [] getWidgetColorRGB (int id) {
 	return getNSColorRGB (color);
 }
 
-double /*float*/ [] getNSColorRGB (NSColor color) {
+double [] getNSColorRGB (NSColor color) {
 	if (color == null) return null;
 	NSColorSpace colorSpace = color.colorSpace();
 	if (colorSpace == null || colorSpace.colorSpaceModel() != OS.NSRGBColorSpaceModel) {
 		color = color.colorUsingColorSpaceName(OS.NSDeviceRGBColorSpace);
 	}
 	if (color == null) return null;
-	double /*float*/[] components = new double /*float*/[(int)/*64*/color.numberOfComponents()];
+	double[] components = new double[(int)color.numberOfComponents()];
 	color.getComponents(components);
-	return new double /*float*/ []{components[0], components[1], components[2], components[3]};
+	return new double []{components[0], components[1], components[2], components[3]};
 }
 
 /**
@@ -1984,7 +1984,7 @@ public Cursor getSystemCursor (int id) {
 }
 
 NSImage getSystemImageForID(int osType) {
-	long /*int*/ iconRef[] = new long /*int*/ [1];
+	long iconRef[] = new long [1];
 	OS.GetIconRefFromTypeInfo(OS.kSystemIconsCreator, osType, 0, 0, 0, iconRef);
 	NSImage nsImage = (NSImage)new NSImage().alloc();
 	nsImage = nsImage.initWithIconRef(iconRef[0]);
@@ -2090,7 +2090,7 @@ public Menu getSystemMenu () {
 		appMenu = new Menu(this, nsAppMenu);
 
 		// Create menu items that correspond to the NSMenuItems.
-		long /*int*/ nsCount = nsAppMenu.numberOfItems();
+		long nsCount = nsAppMenu.numberOfItems();
 		for (int j = 0; j < nsCount; j++) {
 			NSMenuItem currMenuItem = nsAppMenu.itemAtIndex(j);
 			new MenuItem(appMenu, currMenuItem);
@@ -2177,14 +2177,14 @@ int getToolTipTime () {
 	return 560;
 }
 
-Widget getWidget (long /*int*/ id) {
+Widget getWidget (long id) {
 	return GetWidget (id);
 }
 
-static Widget GetWidget (long /*int*/ id) {
+static Widget GetWidget (long id) {
 	if (id == 0) return null;
-	long /*int*/ [] jniRef = new long /*int*/ [1];
-	long /*int*/ iVar = OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
+	long [] jniRef = new long [1];
+	long iVar = OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
 	if (iVar == 0) {
 		if (dynamicObjectMap != null) {
 			NSObject key = new NSObject(id);
@@ -2204,7 +2204,7 @@ Widget getWidget (NSView view) {
 
 boolean hasDefaultButton () {
 	NSArray windows = application.windows();
-	long /*int*/ count = windows.count();
+	long count = windows.count();
 	for (int i = 0; i < count; i++) {
 		NSWindow window  = new NSWindow(windows.objectAtIndex(i));
 		if (window.defaultButtonCell() != null) {
@@ -2247,7 +2247,7 @@ protected void init () {
 
 		if (currAppDelegate == null) {
 			if (OS.class_JRSAppKitAWT != 0) {
-				long /*int*/ currDelegatePtr = OS.objc_msgSend(OS.class_JRSAppKitAWT, OS.sel_awtAppDelegate);
+				long currDelegatePtr = OS.objc_msgSend(OS.class_JRSAppKitAWT, OS.sel_awtAppDelegate);
 				if (currDelegatePtr != 0) {
 					currAppDelegate = new NSObject(currDelegatePtr);
 					currAppDelegate.retain();
@@ -2292,7 +2292,7 @@ protected void init () {
 	if (prefsItem != null) prefsItem.setTag(SWT.ID_PREFERENCES);
 
 	observerCallback = new Callback (this, "observerProc", 3); //$NON-NLS-1$
-	long /*int*/ observerProc = observerCallback.getAddress ();
+	long observerProc = observerCallback.getAddress ();
 	if (observerProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 	int activities = OS.kCFRunLoopBeforeWaiting;
 	runLoopObserver = OS.CFRunLoopObserverCreate (0, activities, true, 0, observerProc, 0);
@@ -2300,18 +2300,18 @@ protected void init () {
 	OS.CFRunLoopAddObserver (OS.CFRunLoopGetCurrent (), runLoopObserver, OS.kCFRunLoopCommonModes ());
 
 	// Add AWT Runloop mode for SWT/AWT.
-	long /*int*/ cls = OS.objc_lookUpClass("JNFRunLoop"); //$NON-NLS-1$
+	long cls = OS.objc_lookUpClass("JNFRunLoop"); //$NON-NLS-1$
 	if (cls != 0) {
-		long /*int*/ mode = OS.objc_msgSend(cls, OS.sel_javaRunLoopMode);
+		long mode = OS.objc_msgSend(cls, OS.sel_javaRunLoopMode);
 		if (mode != 0) {
 			OS.CFRunLoopAddObserver (OS.CFRunLoopGetCurrent (), runLoopObserver, mode);
 		}
 	}
 
 	cursorSetCallback = new Callback(this, "cursorSetProc", 2);
-	long /*int*/ cursorSetProc = cursorSetCallback.getAddress();
+	long cursorSetProc = cursorSetCallback.getAddress();
 	if (cursorSetProc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
-	long /*int*/ method = OS.class_getInstanceMethod(OS.class_NSCursor, OS.sel_set);
+	long method = OS.class_getInstanceMethod(OS.class_NSCursor, OS.sel_set);
 	if (method != 0) oldCursorSetProc = OS.method_setImplementation(method, cursorSetProc);
 
 	timerDelegate = (SWTWindowDelegate)new SWTWindowDelegate().alloc().init();
@@ -2341,7 +2341,7 @@ protected void init () {
 	isPainting = isPainting.initWithCapacity(12);
 }
 
-void addEventMethods (long /*int*/ cls, long /*int*/ proc2, long /*int*/ proc3, long /*int*/ drawRectProc, long /*int*/ hitTestProc, long /*int*/ needsDisplayInRectProc) {
+void addEventMethods (long cls, long proc2, long proc3, long drawRectProc, long hitTestProc, long needsDisplayInRectProc) {
 	if (proc3 != 0) {
 		OS.class_addMethod(cls, OS.sel_mouseDown_, proc3, "@:@");
 		OS.class_addMethod(cls, OS.sel_mouseUp_, proc3, "@:@");
@@ -2396,12 +2396,12 @@ void addEventMethods (long /*int*/ cls, long /*int*/ proc2, long /*int*/ proc3,
 	}
 }
 
-void addFrameMethods(long /*int*/ cls, long /*int*/ setFrameOriginProc, long /*int*/ setFrameSizeProc) {
+void addFrameMethods(long cls, long setFrameOriginProc, long setFrameSizeProc) {
 	OS.class_addMethod(cls, OS.sel_setFrameOrigin_, setFrameOriginProc, "@:{NSPoint}");
 	OS.class_addMethod(cls, OS.sel_setFrameSize_, setFrameSizeProc, "@:{NSSize}");
 }
 
-void addAccessibilityMethods(long /*int*/ cls, long /*int*/ proc2, long /*int*/ proc3, long /*int*/ proc4, long /*int*/ accessibilityHitTestProc) {
+void addAccessibilityMethods(long cls, long proc2, long proc3, long proc4, long accessibilityHitTestProc) {
 	OS.class_addMethod(cls, OS.sel_accessibilityActionNames, proc2, "@:");
 	OS.class_addMethod(cls, OS.sel_accessibilityAttributeNames, proc2, "@:");
 	OS.class_addMethod(cls, OS.sel_accessibilityParameterizedAttributeNames, proc2, "@:");
@@ -2417,24 +2417,24 @@ void addAccessibilityMethods(long /*int*/ cls, long /*int*/ proc2, long /*int*/
 	OS.class_addMethod(cls, OS.sel_accessibleHandle, proc2, "@:");
 }
 
-long /*int*/ registerCellSubclass(long /*int*/ cellClass, int size, int align, byte[] types) {
+long registerCellSubclass(long cellClass, int size, int align, byte[] types) {
 	String cellClassName = OS.class_getName(cellClass);
-	long /*int*/ cls = OS.objc_allocateClassPair(cellClass, "SWTAccessible" + cellClassName, 0);
+	long cls = OS.objc_allocateClassPair(cellClass, "SWTAccessible" + cellClassName, 0);
 	OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
 	OS.objc_registerClassPair(cls);
 	return cls;
 }
 
-long /*int*/ createWindowSubclass(long /*int*/ baseClass, String newClass, boolean isDynamic) {
-	long /*int*/ cls = OS.objc_lookUpClass(newClass);
+long createWindowSubclass(long baseClass, String newClass, boolean isDynamic) {
+	long cls = OS.objc_lookUpClass(newClass);
 	if (cls != 0) return cls;
 	cls = OS.objc_allocateClassPair(baseClass, newClass, 0);
-	long /*int*/ proc3 = windowCallback3.getAddress();
-	long /*int*/ proc2 = windowCallback2.getAddress();
-	long /*int*/ proc4 = windowCallback4.getAddress();
-	long /*int*/ proc6 = windowCallback6.getAddress();
-	long /*int*/ view_stringForToolTip_point_userDataProc = OS.CALLBACK_view_stringForToolTip_point_userData_(proc6);
-	long /*int*/ accessibilityHitTestProc = OS.CALLBACK_accessibilityHitTest_(proc3);
+	long proc3 = windowCallback3.getAddress();
+	long proc2 = windowCallback2.getAddress();
+	long proc4 = windowCallback4.getAddress();
+	long proc6 = windowCallback6.getAddress();
+	long view_stringForToolTip_point_userDataProc = OS.CALLBACK_view_stringForToolTip_point_userData_(proc6);
+	long accessibilityHitTestProc = OS.CALLBACK_accessibilityHitTest_(proc3);
 
 	if (!isDynamic) OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
 	OS.class_addMethod(cls, OS.sel_sendEvent_, proc3, "@:@");
@@ -2449,12 +2449,12 @@ long /*int*/ createWindowSubclass(long /*int*/ baseClass, String newClass, boole
 	return cls;
 }
 
-long /*int*/ createMenuSubclass(long /*int*/ baseClass, String newClass, boolean isDynamic) {
-	long /*int*/ cls = OS.objc_lookUpClass(newClass);
+long createMenuSubclass(long baseClass, String newClass, boolean isDynamic) {
+	long cls = OS.objc_lookUpClass(newClass);
 	if (cls != 0) return cls;
 	cls = OS.objc_allocateClassPair(baseClass, newClass, 0);
-	long /*int*/ proc3 = windowCallback3.getAddress();
-	long /*int*/ proc4 = windowCallback4.getAddress();
+	long proc3 = windowCallback3.getAddress();
+	long proc4 = windowCallback4.getAddress();
 	OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
 	OS.class_addMethod(cls, OS.sel_menuWillOpen_, proc3, "@:@");
 	OS.class_addMethod(cls, OS.sel_menuDidClose_, proc3, "@:@");
@@ -2464,11 +2464,11 @@ long /*int*/ createMenuSubclass(long /*int*/ baseClass, String newClass, boolean
 	return cls;
 }
 
-long /*int*/ createMenuItemSubclass(long /*int*/ baseClass, String newClass, boolean isDynamic) {
-	long /*int*/ cls = OS.objc_lookUpClass(newClass);
+long createMenuItemSubclass(long baseClass, String newClass, boolean isDynamic) {
+	long cls = OS.objc_lookUpClass(newClass);
 	if (cls != 0) return cls;
 	cls = OS.objc_allocateClassPair(baseClass, newClass, 0);
-	long /*int*/ proc2 = windowCallback2.getAddress();
+	long proc2 = windowCallback2.getAddress();
 	if (!isDynamic) OS.class_addIvar(cls, SWT_OBJECT, size, (byte)align, types);
 	OS.class_addMethod(cls, OS.sel_sendSelection, proc2, "@:");
 	OS.objc_registerClassPair(cls);
@@ -2480,71 +2480,71 @@ void initClasses () {
 
 	Class clazz = getClass ();
 	dialogCallback3 = new Callback(clazz, "dialogProc", 3);
-	long /*int*/ dialogProc3 = dialogCallback3.getAddress();
+	long dialogProc3 = dialogCallback3.getAddress();
 	if (dialogProc3 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 	dialogCallback4 = new Callback(clazz, "dialogProc", 4);
-	long /*int*/ dialogProc4 = dialogCallback4.getAddress();
+	long dialogProc4 = dialogCallback4.getAddress();
 	if (dialogProc4 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 	dialogCallback5 = new Callback(clazz, "dialogProc", 5);
-	long /*int*/ dialogProc5 = dialogCallback5.getAddress();
+	long dialogProc5 = dialogCallback5.getAddress();
 	if (dialogProc5 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 	windowCallback3 = new Callback(clazz, "windowProc", 3);
-	long /*int*/ proc3 = windowCallback3.getAddress();
+	long proc3 = windowCallback3.getAddress();
 	if (proc3 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 	windowCallback2 = new Callback(clazz, "windowProc", 2);
-	long /*int*/ proc2 = windowCallback2.getAddress();
+	long proc2 = windowCallback2.getAddress();
 	if (proc2 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 	windowCallback4 = new Callback(clazz, "windowProc", 4);
-	long /*int*/ proc4 = windowCallback4.getAddress();
+	long proc4 = windowCallback4.getAddress();
 	if (proc4 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 	windowCallback5 = new Callback(clazz, "windowProc", 5);
-	long /*int*/ proc5 = windowCallback5.getAddress();
+	long proc5 = windowCallback5.getAddress();
 	if (proc5 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 	windowCallback6 = new Callback(clazz, "windowProc", 6);
-	long /*int*/ proc6 = windowCallback6.getAddress();
+	long proc6 = windowCallback6.getAddress();
 	if (proc6 == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 
-	long /*int*/ isFlippedProc = OS.isFlipped_CALLBACK();
-	long /*int*/ drawRectProc = OS.CALLBACK_drawRect_(proc3);
-	long /*int*/ drawInteriorWithFrameInViewProc = OS.CALLBACK_drawInteriorWithFrame_inView_ (proc4);
-	long /*int*/ drawBezelWithFrameInViewProc = OS.CALLBACK_drawBezelWithFrame_inView_ (proc4);
-	long /*int*/ drawWithExpansionFrameProc = OS.CALLBACK_drawWithExpansionFrame_inView_ (proc4);
-	long /*int*/ imageRectForBoundsProc = OS.CALLBACK_imageRectForBounds_ (proc3);
-	long /*int*/ titleRectForBoundsProc = OS.CALLBACK_titleRectForBounds_ (proc3);
-	long /*int*/ cellSizeForBoundsProc = OS.CALLBACK_cellSizeForBounds_ (proc3);
-	long /*int*/ hitTestForEvent_inRect_ofViewProc = OS.CALLBACK_hitTestForEvent_inRect_ofView_ (proc5);
-	long /*int*/ cellSizeProc = OS.CALLBACK_cellSize (proc2);
-	long /*int*/ drawImageWithFrameInViewProc = OS.CALLBACK_drawImage_withFrame_inView_ (proc5);
-	long /*int*/ drawTitleWithFrameInViewProc = OS.CALLBACK_drawTitle_withFrame_inView_ (proc5);
-	long /*int*/ setFrameOriginProc = OS.CALLBACK_setFrameOrigin_(proc3);
-	long /*int*/ setFrameSizeProc = OS.CALLBACK_setFrameSize_(proc3);
-	long /*int*/ hitTestProc = OS.CALLBACK_hitTest_(proc3);
-	long /*int*/ markedRangeProc = OS.CALLBACK_markedRange (proc2);
-	long /*int*/ selectedRangeProc = OS.CALLBACK_selectedRange (proc2);
-	long /*int*/ highlightSelectionInClipRectProc = OS.CALLBACK_highlightSelectionInClipRect_ (proc3);
-	long /*int*/ setMarkedText_selectedRangeProc = OS.CALLBACK_setMarkedText_selectedRange_(proc4);
-	long /*int*/ attributedSubstringFromRangeProc = OS.CALLBACK_attributedSubstringFromRange_(proc3);
-	long /*int*/ characterIndexForPointProc = OS.CALLBACK_characterIndexForPoint_(proc3);
-	long /*int*/ firstRectForCharacterRangeProc = OS.CALLBACK_firstRectForCharacterRange_(proc3);
-	long /*int*/ textWillChangeSelectionProc = OS.CALLBACK_textView_willChangeSelectionFromCharacterRange_toCharacterRange_(proc5);
-	long /*int*/ accessibilityHitTestProc = OS.CALLBACK_accessibilityHitTest_(proc3);
-	long /*int*/ shouldChangeTextInRange_replacementString_Proc = OS.CALLBACK_shouldChangeTextInRange_replacementString_(proc4);
-	long /*int*/ view_stringForToolTip_point_userDataProc = OS.CALLBACK_view_stringForToolTip_point_userData_(proc6);
-	long /*int*/ canDragRowsWithIndexes_atPoint_Proc = OS.CALLBACK_canDragRowsWithIndexes_atPoint_(proc4);
-	long /*int*/ setNeedsDisplayInRectProc = OS.CALLBACK_setNeedsDisplayInRect_(proc3);
-	long /*int*/ expansionFrameWithFrameProc = OS.CALLBACK_expansionFrameWithFrame_inView_ (proc4);
-	long /*int*/ focusRingMaskBoundsForFrameProc = OS.CALLBACK_focusRingMaskBoundsForFrame_inView_ (proc4);
-	long /*int*/ cacheDisplayInRect_toBitmapImageRepProc = OS.CALLBACK_cacheDisplayInRect_toBitmapImageRep_ (proc4);
-	long /*int*/ sizeOfLabelProc = OS.CALLBACK_sizeOfLabel_ (proc3);
-	long /*int*/ drawLabelInRectProc = OS.CALLBACK_drawLabel_inRect_ (proc4);
-	long /*int*/ drawViewBackgroundInRectProc = OS.CALLBACK_drawViewBackgroundInRect_(proc3);
-	long /*int*/ drawBackgroundInClipRectProc = OS.CALLBACK_drawBackgroundInClipRect_(proc3);
-	long /*int*/ scrollClipView_ToPointProc = OS.CALLBACK_scrollClipView_toPoint_(proc4);
-	long /*int*/ headerRectOfColumnProc = OS.CALLBACK_headerRectOfColumn_(proc3);
-	long /*int*/ columnAtPointProc = OS.CALLBACK_columnAtPoint_(proc3);
+	long isFlippedProc = OS.isFlipped_CALLBACK();
+	long drawRectProc = OS.CALLBACK_drawRect_(proc3);
+	long drawInteriorWithFrameInViewProc = OS.CALLBACK_drawInteriorWithFrame_inView_ (proc4);
+	long drawBezelWithFrameInViewProc = OS.CALLBACK_drawBezelWithFrame_inView_ (proc4);
+	long drawWithExpansionFrameProc = OS.CALLBACK_drawWithExpansionFrame_inView_ (proc4);
+	long imageRectForBoundsProc = OS.CALLBACK_imageRectForBounds_ (proc3);
+	long titleRectForBoundsProc = OS.CALLBACK_titleRectForBounds_ (proc3);
+	long cellSizeForBoundsProc = OS.CALLBACK_cellSizeForBounds_ (proc3);
+	long hitTestForEvent_inRect_ofViewProc = OS.CALLBACK_hitTestForEvent_inRect_ofView_ (proc5);
+	long cellSizeProc = OS.CALLBACK_cellSize (proc2);
+	long drawImageWithFrameInViewProc = OS.CALLBACK_drawImage_withFrame_inView_ (proc5);
+	long drawTitleWithFrameInViewProc = OS.CALLBACK_drawTitle_withFrame_inView_ (proc5);
+	long setFrameOriginProc = OS.CALLBACK_setFrameOrigin_(proc3);
+	long setFrameSizeProc = OS.CALLBACK_setFrameSize_(proc3);
+	long hitTestProc = OS.CALLBACK_hitTest_(proc3);
+	long markedRangeProc = OS.CALLBACK_markedRange (proc2);
+	long selectedRangeProc = OS.CALLBACK_selectedRange (proc2);
+	long highlightSelectionInClipRectProc = OS.CALLBACK_highlightSelectionInClipRect_ (proc3);
+	long setMarkedText_selectedRangeProc = OS.CALLBACK_setMarkedText_selectedRange_(proc4);
+	long attributedSubstringFromRangeProc = OS.CALLBACK_attributedSubstringFromRange_(proc3);
+	long characterIndexForPointProc = OS.CALLBACK_characterIndexForPoint_(proc3);
+	long firstRectForCharacterRangeProc = OS.CALLBACK_firstRectForCharacterRange_(proc3);
+	long textWillChangeSelectionProc = OS.CALLBACK_textView_willChangeSelectionFromCharacterRange_toCharacterRange_(proc5);
+	long accessibilityHitTestProc = OS.CALLBACK_accessibilityHitTest_(proc3);
+	long shouldChangeTextInRange_replacementString_Proc = OS.CALLBACK_shouldChangeTextInRange_replacementString_(proc4);
+	long view_stringForToolTip_point_userDataProc = OS.CALLBACK_view_stringForToolTip_point_userData_(proc6);
+	long canDragRowsWithIndexes_atPoint_Proc = OS.CALLBACK_canDragRowsWithIndexes_atPoint_(proc4);
+	long setNeedsDisplayInRectProc = OS.CALLBACK_setNeedsDisplayInRect_(proc3);
+	long expansionFrameWithFrameProc = OS.CALLBACK_expansionFrameWithFrame_inView_ (proc4);
+	long focusRingMaskBoundsForFrameProc = OS.CALLBACK_focusRingMaskBoundsForFrame_inView_ (proc4);
+	long cacheDisplayInRect_toBitmapImageRepProc = OS.CALLBACK_cacheDisplayInRect_toBitmapImageRep_ (proc4);
+	long sizeOfLabelProc = OS.CALLBACK_sizeOfLabel_ (proc3);
+	long drawLabelInRectProc = OS.CALLBACK_drawLabel_inRect_ (proc4);
+	long drawViewBackgroundInRectProc = OS.CALLBACK_drawViewBackgroundInRect_(proc3);
+	long drawBackgroundInClipRectProc = OS.CALLBACK_drawBackgroundInClipRect_(proc3);
+	long scrollClipView_ToPointProc = OS.CALLBACK_scrollClipView_toPoint_(proc4);
+	long headerRectOfColumnProc = OS.CALLBACK_headerRectOfColumn_(proc3);
+	long columnAtPointProc = OS.CALLBACK_columnAtPoint_(proc3);
 
 	String className;
-	long /*int*/ cls;
+	long cls;
 
 	className = "SWTBox";
 	cls = OS.objc_allocateClassPair(OS.class_NSBox, className, 0);
@@ -2778,7 +2778,7 @@ void initClasses () {
 	OS.objc_registerClassPair(cls);
 	if (OS.VERSION >= 0x1070) {
 		/* Note that isFlippedProc is used for performance and convenience */
-		long /*int*/ metaClass = OS.objc_getMetaClass(className);
+		long metaClass = OS.objc_getMetaClass(className);
 		OS.class_addMethod(metaClass, OS.sel_isCompatibleWithOverlayScrollers, isFlippedProc, "@:");
 	}
 
@@ -2836,7 +2836,7 @@ void initClasses () {
 	OS.class_addMethod(cls, OS.sel_textView_willChangeSelectionFromCharacterRange_toCharacterRange_, textWillChangeSelectionProc, "@:@{NSRange}{NSRange}");
 	OS.objc_registerClassPair(cls);
 
-	long /*int*/ nsSecureTextViewClass = OS.objc_lookUpClass("NSSecureTextView");
+	long nsSecureTextViewClass = OS.objc_lookUpClass("NSSecureTextView");
 	if (nsSecureTextViewClass != 0) {
 		className = "SWTSecureEditorView";
 		cls = OS.objc_allocateClassPair(nsSecureTextViewClass, className, 0);
@@ -3045,9 +3045,9 @@ void initClasses () {
 	OS.objc_registerClassPair(cls);
 }
 
-NSFont getFont (long /*int*/ cls, long /*int*/ sel) {
-	long /*int*/ widget = OS.objc_msgSend (OS.objc_msgSend (cls, OS.sel_alloc), OS.sel_initWithFrame_, new NSRect());
-	long /*int*/ font = 0;
+NSFont getFont (long cls, long sel) {
+	long widget = OS.objc_msgSend (OS.objc_msgSend (cls, OS.sel_alloc), OS.sel_initWithFrame_, new NSRect());
+	long font = 0;
 	if (OS.objc_msgSend_bool (widget, OS.sel_respondsToSelector_, sel)) {
 		font = OS.objc_msgSend (widget, sel);
 	}
@@ -3067,9 +3067,9 @@ void initColors (boolean ignoreColorChange) {
 		/*
 		 * Code to ignore changes to System textColor, textBackgroundColor and controlTextColor
 		 */
-		double /*float*/ [] color_list_foreground = colors[SWT.COLOR_LIST_FOREGROUND];
-		double /*float*/ [] color_list_background = colors[SWT.COLOR_LIST_BACKGROUND];
-		double /*float*/ [] color_widget_foreground = colors[SWT.COLOR_WIDGET_FOREGROUND];
+		double [] color_list_foreground = colors[SWT.COLOR_LIST_FOREGROUND];
+		double [] color_list_background = colors[SWT.COLOR_LIST_BACKGROUND];
+		double [] color_widget_foreground = colors[SWT.COLOR_WIDGET_FOREGROUND];
 		initColors ();
 		colors[SWT.COLOR_LIST_FOREGROUND] = color_list_foreground;
 		colors[SWT.COLOR_LIST_BACKGROUND] = color_list_background;
@@ -3080,7 +3080,7 @@ void initColors (boolean ignoreColorChange) {
 }
 
 void initColors () {
-	colors = new double /*float*/ [SWT.COLOR_LINK_FOREGROUND + 1][];
+	colors = new double [SWT.COLOR_LINK_FOREGROUND + 1][];
 	colors[SWT.COLOR_INFO_FOREGROUND] = getWidgetColorRGB(SWT.COLOR_INFO_FOREGROUND);
 	colors[SWT.COLOR_INFO_BACKGROUND] = getWidgetColorRGB(SWT.COLOR_INFO_BACKGROUND);
 	colors[SWT.COLOR_TITLE_FOREGROUND] = getWidgetColorRGB(SWT.COLOR_TITLE_FOREGROUND);
@@ -3150,7 +3150,7 @@ void initFonts () {
  * @noreference This method is not intended to be referenced by clients.
  */
 @Override
-public long /*int*/ internal_new_GC (GCData data) {
+public long internal_new_GC (GCData data) {
 	if (isDisposed()) error(SWT.ERROR_DEVICE_DISPOSED);
 	if (screenWindow == null) {
 		NSWindow window = (NSWindow) new NSWindow ().alloc ();
@@ -3194,7 +3194,7 @@ public long /*int*/ internal_new_GC (GCData data) {
  * @noreference This method is not intended to be referenced by clients.
  */
 @Override
-public void internal_dispose_GC (long /*int*/ hDC, GCData data) {
+public void internal_dispose_GC (long hDC, GCData data) {
 	if (isDisposed()) error(SWT.ERROR_DEVICE_DISPOSED);
 }
 
@@ -3286,8 +3286,8 @@ public boolean post(Event event) {
 	synchronized (Device.class) {
 		if (isDisposed ()) error (SWT.ERROR_DEVICE_DISPOSED);
 		if (event == null) error (SWT.ERROR_NULL_ARGUMENT);
-		long /*int*/ eventRef = 0;
-		long /*int*/ eventSource = OS.CGEventSourceCreate(OS.kCGEventSourceStateHIDSystemState);
+		long eventRef = 0;
+		long eventSource = OS.CGEventSourceCreate(OS.kCGEventSourceStateHIDSystemState);
 		if (eventSource == 0) return false;
 		boolean returnValue = false;
 		int deadKeyState[] = new int[1];
@@ -3297,9 +3297,9 @@ public boolean post(Event event) {
 			case SWT.KeyUp: {
 				short vKey = (short)Display.untranslateKey (event.keyCode);
 				if (vKey == 0) {
-					long /*int*/ uchrPtr = 0;
-					long /*int*/ currentKbd = OS.TISCopyCurrentKeyboardInputSource();
-					long /*int*/ uchrCFData = OS.TISGetInputSourceProperty(currentKbd, OS.kTISPropertyUnicodeKeyLayoutData());
+					long uchrPtr = 0;
+					long currentKbd = OS.TISCopyCurrentKeyboardInputSource();
+					long uchrCFData = OS.TISGetInputSourceProperty(currentKbd, OS.kTISPropertyUnicodeKeyLayoutData());
 
 					if (uchrCFData == 0) return false;
 					uchrPtr = OS.CFDataGetBytePtr(uchrCFData);
@@ -3684,8 +3684,8 @@ public Rectangle map (Control from, Control to, int x, int y, int width, int hei
 	return rectangle;
 }
 
-long /*int*/ observerProc (long /*int*/ observer, long /*int*/ activity, long /*int*/ info) {
-	switch ((int)/*64*/activity) {
+long observerProc (long observer, long activity, long info) {
+	switch ((int)activity) {
 		case OS.kCFRunLoopBeforeWaiting:
 			if (runAsyncMessages) {
 				if (runAsyncMessages (false)) wakeThread ();
@@ -3699,8 +3699,8 @@ boolean performKeyEquivalent(NSWindow window, NSEvent nsEvent) {
 	if (modalDialog == null) return false;
 	if (nsEvent.type() != OS.NSKeyDown) return false;
 	int stateMask = 0;
-	long /*int*/ selector = 0;
-	long /*int*/ modifierFlags = nsEvent.modifierFlags();
+	long selector = 0;
+	long modifierFlags = nsEvent.modifierFlags();
 	if ((modifierFlags & OS.NSAlternateKeyMask) != 0) stateMask |= SWT.ALT;
 	if ((modifierFlags & OS.NSShiftKeyMask) != 0) stateMask |= SWT.SHIFT;
 	if ((modifierFlags & OS.NSControlKeyMask) != 0) stateMask |= SWT.CONTROL;
@@ -3938,7 +3938,7 @@ void releaseDisplay () {
 	markedAttributes = null;
 
 	if (oldCursorSetProc != 0) {
-		long /*int*/ method = OS.class_getInstanceMethod(OS.class_NSCursor, OS.sel_set);
+		long method = OS.class_getInstanceMethod(OS.class_NSCursor, OS.sel_set);
 		OS.method_setImplementation(method, oldCursorSetProc);
 	}
 	if (cursorSetCallback != null) cursorSetCallback.dispose();
@@ -3954,7 +3954,7 @@ void releaseDisplay () {
 	if (!isEmbedded) {
 		//remove all existing menu items except the application menu
 		NSMenu menubar = application.mainMenu();
-		long /*int*/ count = menubar.numberOfItems();
+		long count = menubar.numberOfItems();
 		while (count > 1) {
 			menubar.removeItemAtIndex(count - 1);
 			count--;
@@ -4060,8 +4060,8 @@ public void removeListener (int eventType, Listener listener) {
 
 Widget removeWidget (NSObject view) {
 	if (view == null) return null;
-	long /*int*/ [] jniRef = new long /*int*/ [1];
-	long /*int*/ iVar = OS.object_getInstanceVariable(view.id, SWT_OBJECT, jniRef);
+	long [] jniRef = new long [1];
+	long iVar = OS.object_getInstanceVariable(view.id, SWT_OBJECT, jniRef);
 
 	if (iVar == 0) {
 		if (dynamicObjectMap != null) {
@@ -4112,9 +4112,9 @@ boolean runAsyncMessages (boolean all) {
 }
 
 boolean runAWTInvokeLater() {
-	long /*int*/ cls = OS.objc_lookUpClass("JNFRunLoop");
+	long cls = OS.objc_lookUpClass("JNFRunLoop");
 	if (cls == 0) return false;
-	long /*int*/ mode = OS.objc_msgSend(cls, OS.sel_javaRunLoopMode);
+	long mode = OS.objc_msgSend(cls, OS.sel_javaRunLoopMode);
 	if (mode == 0) return false;
 	NSString javaRunLoopMode = new NSString(mode);
 	allowTimers = runAsyncMessages = false;
@@ -4204,7 +4204,7 @@ NSArray runLoopModes() {
 boolean runPaint () {
 	if (needsDisplay == null && needsDisplayInRect == null) return false;
 	if (needsDisplay != null) {
-		long /*int*/ count = needsDisplay.count();
+		long count = needsDisplay.count();
 		for (int i = 0; i < count; i++) {
 			OS.objc_msgSend(needsDisplay.objectAtIndex(i).id, OS.sel_setNeedsDisplay_, true);
 		}
@@ -4212,7 +4212,7 @@ boolean runPaint () {
 		needsDisplay = null;
 	}
 	if (needsDisplayInRect != null) {
-		long /*int*/ count = needsDisplayInRect.count();
+		long count = needsDisplayInRect.count();
 		for (int i = 0; i < count; i+=2) {
 			NSValue value = new NSValue(needsDisplayInRect.objectAtIndex(i+1));
 			OS.objc_msgSend(needsDisplayInRect.objectAtIndex(i).id, OS.sel_setNeedsDisplayInRect_, value.rectValue());
@@ -4429,7 +4429,7 @@ public void sendPostExternalEventDispatchEvent () {
 static NSString getApplicationName() {
 	NSString name = null;
 	int pid = OS.getpid ();
-	long /*int*/ ptr = C.getenv (ascii ("APP_NAME_" + pid));
+	long ptr = C.getenv (ascii ("APP_NAME_" + pid));
 	if (ptr != 0) name = NSString.stringWithUTF8String(ptr);
 	if (name == null && APP_NAME != null) name = NSString.stringWith(APP_NAME);
 	if (name == null) {
@@ -4738,7 +4738,7 @@ void setMenuBar (Menu menu) {
 	*/
 //	menubar.cancelTracking();
 	OS.CancelMenuTracking (OS.AcquireRootMenu (), true, 0);
-	long /*int*/ count = menubar.numberOfItems();
+	long count = menubar.numberOfItems();
 	while (count > 1) {
 		menubar.removeItemAtIndex(count - 1);
 		count--;
@@ -5063,7 +5063,7 @@ public void timerExec (int milliseconds, Runnable runnable) {
 	}
 }
 
-long /*int*/ timerProc (long /*int*/ id, long /*int*/ sel, long /*int*/ timerID) {
+long timerProc (long id, long sel, long timerID) {
 	NSTimer timer = new NSTimer (timerID);
 	try {
 		NSNumber number = new NSNumber(timer.userInfo());
@@ -5139,7 +5139,7 @@ void updateQuitMenu () {
 		NSMenu sm = appitem.submenu();
 
 		// Normally this would be sel_terminate_ but we changed it so terminate: doesn't kill the app.
-		long /*int*/ quitIndex = sm.indexOfItemWithTarget(applicationDelegate, OS.sel_applicationShouldTerminate_);
+		long quitIndex = sm.indexOfItemWithTarget(applicationDelegate, OS.sel_applicationShouldTerminate_);
 
 		if (quitIndex != -1) {
 			NSMenuItem quitItem = sm.itemAtIndex(quitIndex);
@@ -5181,12 +5181,12 @@ Control findControl (boolean checkTrim) {
 Control findControl (boolean checkTrim, NSView[] hitView) {
 	NSView view = null;
 	NSPoint screenLocation = NSEvent.mouseLocation();
-	long /*int*/ hitWindowNumber = 0;
+	long hitWindowNumber = 0;
 	if (OS.VERSION >= 0x1060) {
 		hitWindowNumber = NSWindow.windowNumberAtPoint(screenLocation, 0);
 	} else {
-		long /*int*/ outWindow[] = new long /*int*/ [1];
-		OS.FindWindow ((long /*int*/)screenLocation.x, (long /*int*/)(getPrimaryFrame().height - screenLocation.y), outWindow);
+		long outWindow[] = new long [1];
+		OS.FindWindow ((long)screenLocation.x, (long)(getPrimaryFrame().height - screenLocation.y), outWindow);
 
 		if (outWindow[0] != 0) {
 			hitWindowNumber = OS.HIWindowGetCGWindowID(outWindow[0]);
@@ -5224,7 +5224,7 @@ Control findControl (boolean checkTrim, NSView[] hitView) {
 	return control;
 }
 
-void finishLaunching (long /*int*/ id, long /*int*/ sel) {
+void finishLaunching (long id, long sel) {
 	/*
 	* [NSApplication finishLaunching] cannot run multiple times otherwise
 	* multiple main menus are added.
@@ -5237,7 +5237,7 @@ void finishLaunching (long /*int*/ id, long /*int*/ sel) {
 	OS.objc_msgSendSuper(super_struct, sel);
 }
 
-void applicationDidBecomeActive (long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void applicationDidBecomeActive (long id, long sel, long notification) {
 	NSWindow keyWindow = application.keyWindow();
 	if (keyWindow != null) {
 		keyWindow.orderFrontRegardless();
@@ -5248,19 +5248,19 @@ void applicationDidBecomeActive (long /*int*/ id, long /*int*/ sel, long /*int*/
 	checkEnterExit(findControl(true), null, false);
 }
 
-void applicationDidResignActive (long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void applicationDidResignActive (long id, long sel, long notification) {
 	checkFocus();
 	checkEnterExit(null, null, false);
 }
 
-long /*int*/ applicationNextEventMatchingMask (long /*int*/ id, long /*int*/ sel, long /*int*/ mask, long /*int*/ expiration, long /*int*/ mode, long /*int*/ dequeue) {
+long applicationNextEventMatchingMask (long id, long sel, long mask, long expiration, long mode, long dequeue) {
 	if (dequeue != 0 && trackingControl != null && !trackingControl.isDisposed()) runDeferredEvents();
 	sendPreExternalEventDispatchEvent();
 	try {
 		objc_super super_struct = new objc_super();
 		super_struct.receiver = id;
 		super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
-		long /*int*/ result = OS.objc_msgSendSuper(super_struct, sel, mask, expiration, mode, dequeue != 0);
+		long result = OS.objc_msgSendSuper(super_struct, sel, mask, expiration, mode, dequeue != 0);
 		if (result != 0) {
 			/*
 			 * Feature of Cocoa.  When an NSComboBox's items list is visible it runs an event
@@ -5294,7 +5294,7 @@ long /*int*/ applicationNextEventMatchingMask (long /*int*/ id, long /*int*/ sel
 }
 
 void applicationSendTrackingEvent (NSEvent nsEvent, Control trackingControl) {
-	int type = (int)/*64*/nsEvent.type();
+	int type = (int)nsEvent.type();
 	boolean runEnterExit = false;
 	Control runEnterExitControl = null;
 	switch (type) {
@@ -5332,13 +5332,13 @@ void applicationSendTrackingEvent (NSEvent nsEvent, Control trackingControl) {
 	}
 }
 
-void applicationSendEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void applicationSendEvent (long id, long sel, long event) {
 	NSEvent nsEvent = new NSEvent(event);
 	NSWindow window = nsEvent.window ();
 
 	if (performKeyEquivalent(window, nsEvent)) return;
 
-	int type = (int)/*64*/nsEvent.type ();
+	int type = (int)nsEvent.type ();
 	boolean activate = false, down = false;
 	switch (type) {
 		case OS.NSLeftMouseDown:
@@ -5407,7 +5407,7 @@ void applicationSendEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event
 	if (type != OS.NSAppKitDefined) sendEvent = false;
 }
 
-void applicationWillFinishLaunching (long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void applicationWillFinishLaunching (long id, long sel, long notification) {
 	boolean loaded = false;
 
 	/*
@@ -5420,7 +5420,7 @@ void applicationWillFinishLaunching (long /*int*/ id, long /*int*/ sel, long /*i
 	 * return a non-zero value indicating failure, which we ignore.
 	 */
 	if (isEmbedded) {
-		long /*int*/ outMenu [] = new long /*int*/ [1];
+		long outMenu [] = new long [1];
 		short outIndex[] = new short[1];
 		int status = OS.GetIndMenuItemWithCommandID(0, OS.kHICommandHide, 1, outMenu, outIndex);
 		if (status == 0) OS.DeleteMenuItem(outMenu[0], outIndex[0]);
@@ -5487,7 +5487,7 @@ void applicationWillFinishLaunching (long /*int*/ id, long /*int*/ sel, long /*i
 			NSMenuItem ni = new NSMenuItem(ia.objectAtIndex(i));
 			NSString title = ni.title().stringByReplacingOccurrencesOfString(match, name);
 			ni.setTitle(title);
-			long /*int*/ newTag = 0;
+			long newTag = 0;
 			switch(i) {
 				case 0:
 					newTag = SWT.ID_ABOUT;
@@ -5511,7 +5511,7 @@ void applicationWillFinishLaunching (long /*int*/ id, long /*int*/ sel, long /*i
 			if (newTag != 0) ni.setTag(newTag);
 		}
 
-		long /*int*/ quitIndex = sm.indexOfItemWithTarget(applicationDelegate, OS.sel_terminate_);
+		long quitIndex = sm.indexOfItemWithTarget(applicationDelegate, OS.sel_terminate_);
 
 		if (quitIndex != -1) {
 			NSMenuItem quitItem = sm.itemAtIndex(quitIndex);
@@ -5520,7 +5520,7 @@ void applicationWillFinishLaunching (long /*int*/ id, long /*int*/ sel, long /*i
 	}
 }
 
-static long /*int*/ applicationProc(long /*int*/ id, long /*int*/ sel) {
+static long applicationProc(long id, long sel) {
 	//TODO optimize getting the display
 	Display display = getCurrent ();
 	if (display == null) {
@@ -5539,7 +5539,7 @@ static long /*int*/ applicationProc(long /*int*/ id, long /*int*/ sel) {
 	return 0;
 }
 
-static long /*int*/ applicationProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+static long applicationProc(long id, long sel, long arg0) {
 	//TODO optimize getting the display
 	Display display = getCurrent ();
 	if (display == null && id != applicationDelegate.id) {
@@ -5624,7 +5624,7 @@ static long /*int*/ applicationProc(long /*int*/ id, long /*int*/ sel, long /*in
 	}
 }
 
-static long /*int*/ applicationProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+static long applicationProc(long id, long sel, long arg0, long arg1) {
 	Display display = getCurrent();
 
 	if (display == null && id != applicationDelegate.id) {
@@ -5649,7 +5649,7 @@ static long /*int*/ applicationProc(long /*int*/ id, long /*int*/ sel, long /*in
 		}
 		case sel_application_openFiles_: {
 			NSArray files = new NSArray(arg1);
-			long /*int*/ count = files.count();
+			long count = files.count();
 			for (int i=0; i<count; i++) {
 				String file = new NSString(files.objectAtIndex(i)).getString();
 				Event event = new Event();
@@ -5661,7 +5661,7 @@ static long /*int*/ applicationProc(long /*int*/ id, long /*int*/ sel, long /*in
 		}
 		case sel_application_openUrls_: {
 			NSArray urls = new NSArray(arg1);
-			long /*int*/ count = urls.count();
+			long count = urls.count();
 			for (int i=0; i<count; i++) {
 				String url = new NSString(urls.objectAtIndex(i)).getString();
 				Event event = new Event();
@@ -5682,7 +5682,7 @@ static long /*int*/ applicationProc(long /*int*/ id, long /*int*/ sel, long /*in
 	}
 }
 
-static long /*int*/ applicationProc(long /*int*/ id, long /*int*/sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
+static long applicationProc(long id, long sel, long arg0, long arg1, long arg2, long arg3) {
 	//TODO optimize getting the display
 	Display display = getCurrent ();
 	if (display == null && id != applicationDelegate.id) {
@@ -5697,8 +5697,8 @@ static long /*int*/ applicationProc(long /*int*/ id, long /*int*/sel, long /*int
 	return 0;
 }
 
-static long /*int*/ dialogProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
-	long /*int*/ [] jniRef = new long /*int*/ [1];
+static long dialogProc(long id, long sel, long arg0) {
+	long [] jniRef = new long [1];
 	OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
 	if (jniRef[0] == 0) return 0;
 
@@ -5741,8 +5741,8 @@ static long /*int*/ dialogProc(long /*int*/ id, long /*int*/ sel, long /*int*/ a
 	}
 }
 
-static long /*int*/ dialogProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
-	long /*int*/ [] jniRef = new long /*int*/ [1];
+static long dialogProc(long id, long sel, long arg0, long arg1) {
+	long [] jniRef = new long [1];
 	OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
 	if (jniRef[0] == 0) return 0;
 	if (sel == OS.sel_panel_shouldShowFilename_) {
@@ -5759,8 +5759,8 @@ static long /*int*/ dialogProc(long /*int*/ id, long /*int*/ sel, long /*int*/ a
 	return 0;
 }
 
-static long /*int*/ dialogProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
-	long /*int*/ [] jniRef = new long /*int*/ [1];
+static long dialogProc(long id, long sel, long arg0, long arg1, long arg2) {
+	long [] jniRef = new long [1];
 	OS.object_getInstanceVariable(id, SWT_OBJECT, jniRef);
 	if (jniRef[0] == 0) return 0;
 	if (sel == OS.sel_panelDidEnd_returnCode_contextInfo_) {
@@ -5771,7 +5771,7 @@ static long /*int*/ dialogProc(long /*int*/ id, long /*int*/ sel, long /*int*/ a
 	return 0;
 }
 
-static Widget LookupWidget (long /*int*/ id, long /*int*/ sel) {
+static Widget LookupWidget (long id, long sel) {
 	Widget widget = GetWidget(id);
 	if (widget == null) {
 		NSView view = new NSView (id);
@@ -5784,10 +5784,10 @@ static Widget LookupWidget (long /*int*/ id, long /*int*/ sel) {
 	return widget;
 }
 
-static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel) {
+static long windowProc(long id, long sel) {
 	if (sel == OS.sel_cellClass) {
-		long /*int*/ superCls = OS.objc_msgSend(OS.class_getSuperclass(id), sel);
-		long /*int*/ cls = OS.objc_lookUpClass("SWTAccessible" + OS.class_getName(superCls));
+		long superCls = OS.objc_msgSend(OS.class_getSuperclass(id), sel);
+		long cls = OS.objc_lookUpClass("SWTAccessible" + OS.class_getName(superCls));
 		return cls != 0 ? cls : superCls;
 	}
 	/*
@@ -5871,21 +5871,21 @@ static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel) {
 		case sel_markedRange: {
 			NSRange range = widget.markedRange (id, sel);
 			/* NOTE that this is freed in C */
-			long /*int*/ result = C.malloc (NSRange.sizeof);
+			long result = C.malloc (NSRange.sizeof);
 			OS.memmove (result, range, NSRange.sizeof);
 			return result;
 		}
 		case sel_selectedRange: {
 			NSRange range = widget.selectedRange (id, sel);
 			/* NOTE that this is freed in C */
-			long /*int*/ result = C.malloc (NSRange.sizeof);
+			long result = C.malloc (NSRange.sizeof);
 			OS.memmove (result, range, NSRange.sizeof);
 			return result;
 		}
 		case sel_cellSize: {
 			NSSize size = widget.cellSize (id, sel);
 			/* NOTE that this is freed in C */
-			long /*int*/ result = C.malloc (NSSize.sizeof);
+			long result = C.malloc (NSSize.sizeof);
 			OS.memmove (result, size, NSSize.sizeof);
 			return result;
 		}
@@ -5950,7 +5950,7 @@ static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel) {
 	}
 }
 
-static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+static long windowProc(long id, long sel, long arg0) {
 	/*
 	* Feature in Cocoa.  In Cocoa, the default button animation is done
 	* in a separate thread that calls drawRect() and isOpaque() from
@@ -6441,7 +6441,7 @@ static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel, long /*int*/ a
 	}
 }
 
-static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+static long windowProc(long id, long sel, long arg0, long arg1) {
 	Widget widget = LookupWidget(id, sel);
 	if (widget == null) return 0;
 
@@ -6524,7 +6524,7 @@ static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel, long /*int*/ a
 			OS.memmove(rect, arg0, NSRect.sizeof);
 			rect = widget.expansionFrameWithFrame_inView(id, sel, rect, arg1);
 			/* NOTE that this is freed in C */
-			long /*int*/ result = C.malloc (NSRect.sizeof);
+			long result = C.malloc (NSRect.sizeof);
 			OS.memmove (result, rect, NSRect.sizeof);
 			return result;
 		}
@@ -6533,7 +6533,7 @@ static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel, long /*int*/ a
 			OS.memmove(rect, arg0, NSRect.sizeof);
 			rect = widget.focusRingMaskBoundsForFrame(id, sel, rect, arg1);
 			/* NOTE that this is freed in C */
-			long /*int*/ result = C.malloc (NSRect.sizeof);
+			long result = C.malloc (NSRect.sizeof);
 			OS.memmove (result, rect, NSRect.sizeof);
 			return result;
 		}
@@ -6572,7 +6572,7 @@ static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel, long /*int*/ a
 	}
 }
 
-static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
+static long windowProc(long id, long sel, long arg0, long arg1, long arg2) {
 	Widget widget = LookupWidget(id, sel);
 	if (widget == null) return 0;
 
@@ -6604,7 +6604,7 @@ static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel, long /*int*/ a
 		case sel_textView_willChangeSelectionFromCharacterRange_toCharacterRange_: {
 			NSRange range = widget.textView_willChangeSelectionFromCharacterRange_toCharacterRange(id, sel, arg0, arg1, arg2);
 			/* NOTE that this is freed in C */
-			long /*int*/ result = C.malloc (NSRange.sizeof);
+			long result = C.malloc (NSRange.sizeof);
 			OS.memmove (result, range, NSRange.sizeof);
 			return result;
 		}
@@ -6624,7 +6624,7 @@ static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel, long /*int*/ a
 			OS.memmove (rect, arg1, NSRect.sizeof);
 			rect = widget.drawTitleWithFrameInView (id, sel, arg0, rect, arg2);
 			/* NOTE that this is freed in C */
-			long /*int*/ result = C.malloc (NSRect.sizeof);
+			long result = C.malloc (NSRect.sizeof);
 			OS.memmove (result, rect, NSRect.sizeof);
 			return result;
 		}
@@ -6648,7 +6648,7 @@ static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel, long /*int*/ a
 	}
 }
 
-static long /*int*/ windowProc(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3) {
+static long windowProc(long id, long sel, long arg0, long arg1, long arg2, long arg3) {
 	Widget widget = LookupWidget(id, sel);
 	if (widget == null) return 0;
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FileDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FileDialog.java
index b91b7623ad..89ec8fbe3c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FileDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FileDialog.java
@@ -52,9 +52,9 @@ public class FileDialog extends Dialog {
 	String fullPath;
 	SWTPanelDelegate delegate = null;
 	int filterIndex = -1;
-	long /*int*/ jniRef = 0;
-	long /*int*/ method = 0;
-	long /*int*/ methodImpl = 0;
+	long jniRef = 0;
+	long method = 0;
+	long methodImpl = 0;
 	boolean overwrite = false;
 	static final char EXTENSION_SEPARATOR = ';';
 
@@ -116,7 +116,7 @@ long _completionHandler (long result) {
 	return result;
 }
 
-long /*int*/ _overwriteExistingFileCheck (long /*int*/ id, long /*int*/ sel, long /*int*/ str) {
+long _overwriteExistingFileCheck (long id, long sel, long str) {
 	return 1;
 }
 
@@ -215,7 +215,7 @@ void handleResponse (long response) {
 	display.setModalDialog(null);
 
 	if (popup != null) {
-		filterIndex = (int)/*64*/popup.indexOfSelectedItem();
+		filterIndex = (int)popup.indexOfSelectedItem();
 	} else {
 		filterIndex = -1;
 	}
@@ -230,7 +230,7 @@ void handleResponse (long response) {
 		} else {
 			fullPath = filename.getString();
 			NSArray filenames = ((NSOpenPanel)panel).filenames();
-			int count = (int)/*64*/filenames.count();
+			int count = (int)filenames.count();
 			fileNames = new String[count];
 
 			for (int i = 0; i < count; i++) {
@@ -276,7 +276,7 @@ public String open () {
 		panel = savePanel;
 		if (!overwrite) {
 			callback_overwrite_existing_file = new Callback(this, "_overwriteExistingFileCheck", 3);
-			long /*int*/ proc = callback_overwrite_existing_file.getAddress();
+			long proc = callback_overwrite_existing_file.getAddress();
 			if (proc == 0) error (SWT.ERROR_NO_MORE_CALLBACKS);
 			method = OS.class_getInstanceMethod(OS.class_NSSavePanel, OS.sel_overwriteExistingFileCheck);
 			if (method != 0) methodImpl = OS.method_setImplementation(method, proc);
@@ -353,7 +353,7 @@ public String open () {
 	return fullPath;
 }
 
-long /*int*/ panel_shouldShowFilename (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+long panel_shouldShowFilename (long id, long sel, long arg0, long arg1) {
 	if ((style & SWT.SAVE) != 0) {
 		/* All filenames are always disabled in the NSSavePanel, so return from here. */
 		return 1;
@@ -361,7 +361,7 @@ long /*int*/ panel_shouldShowFilename (long /*int*/ id, long /*int*/ sel, long /
 	NSString path = new NSString(arg1);
 	if (filterExtensions != null && filterExtensions.length != 0) {
 		NSFileManager manager = NSFileManager.defaultManager();
-		long /*int*/ ptr = C.malloc(1);
+		long ptr = C.malloc(1);
 		boolean found = manager.fileExistsAtPath(path, ptr);
 		byte[] isDirectory = new byte[1];
 		C.memmove(isDirectory, ptr, 1);
@@ -371,7 +371,7 @@ long /*int*/ panel_shouldShowFilename (long /*int*/ id, long /*int*/ sel, long /
 				return 1;
 			} else if (popup != null) {
 				String fileName = path.lastPathComponent().getString();
-				int filterIndex = (int)/*64*/popup.indexOfSelectedItem();
+				int filterIndex = (int)popup.indexOfSelectedItem();
 				String extensions = filterExtensions [filterIndex];
 				int start = 0, length = extensions.length ();
 				while (start < length) {
@@ -420,9 +420,9 @@ void releaseHandles() {
 	panel = null;
 }
 
-void sendSelection (long /*int*/ id, long /*int*/ sel, long /*int*/ arg) {
+void sendSelection (long id, long sel, long arg) {
 	if (filterExtensions != null && filterExtensions.length > 0) {
-		String fileTypes = filterExtensions[(int)/*64*/popup.indexOfSelectedItem ()];
+		String fileTypes = filterExtensions[(int)popup.indexOfSelectedItem ()];
 		panel.setTreatsFilePackagesAsDirectories (shouldTreatAppAsDirectory (fileTypes));
 		setAllowedFileType (fileTypes);
 	}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java
index c5e74e74f2..14e9712cc8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java
@@ -88,7 +88,7 @@ public FontDialog (Shell parent, int style) {
 	checkSubclass ();
 }
 
-void changeFont(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void changeFont(long id, long sel, long arg0) {
 	selected = true;
 }
 
@@ -169,7 +169,7 @@ public FontData open () {
 	Font font = create ? new Font(display, fontData) : display.getSystemFont();
 	panel.setPanelFont(font.handle, false);
 	SWTPanelDelegate delegate = (SWTPanelDelegate)new SWTPanelDelegate().alloc().init();
-	long /*int*/ jniRef = OS.NewGlobalRef(this);
+	long jniRef = OS.NewGlobalRef(this);
 	if (jniRef == 0) error(SWT.ERROR_NO_HANDLES);
 	OS.object_setInstanceVariable(delegate.id, Display.SWT_OBJECT, jniRef);
 	panel.setDelegate(delegate);
@@ -192,12 +192,12 @@ public FontData open () {
 	return fontData;
 }
 
-void setColor_forAttribute(long /*int*/ id, long /*int*/ sel, long /*int*/ colorArg, long /*int*/ attribute) {
+void setColor_forAttribute(long id, long sel, long colorArg, long attribute) {
 	if (attribute != 0 && NSString.stringWith("NSColor").isEqualToString(new NSString(attribute))) { //$NON-NLS-1$
 		if (colorArg != 0) {
 			NSColor color = new NSColor(colorArg);
 			Display display = parent != null ? parent.getDisplay() : Display.getCurrent();
-			double /*float*/ [] handle = display.getNSColorRGB(color);
+			double [] handle = display.getNSColorRGB(color);
 			if (handle != null) {
 				rgb = new RGB((int)(handle[0] * 255), (int)(handle[1] * 255), (int)(handle[2] * 255));
 			}
@@ -271,11 +271,11 @@ public void setRGB (RGB rgb) {
 	this.rgb = rgb;
 }
 
-int validModesForFontPanel(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+int validModesForFontPanel(long id, long sel, long arg0) {
 	return effectsVisible ? OS.NSFontPanelAllModesMask : OS.NSFontPanelAllModesMask & ~OS.NSFontPanelAllEffectsModeMask;
 }
 
-void windowWillClose(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
+void windowWillClose(long id, long sel, long sender) {
 	NSApplication.sharedApplication().stop(null);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java
index 79617f95ae..0ae7385c22 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java
@@ -161,7 +161,7 @@ void deregister () {
 }
 
 @Override
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rect) {
 	if (id != view.id) return;
 	fillBackground (view, context, rect, -1);
 }
@@ -237,7 +237,7 @@ void setFont(NSFont font) {
 }
 
 @Override
-void setForeground (double /*float*/ [] color) {
+void setForeground (double [] color) {
 	NSColor nsColor;
 	if (color == null) {
 		nsColor = NSColor.textColor ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java
index 18b8bda2bf..36acea4740 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/IME.java
@@ -90,14 +90,14 @@ public IME (Canvas parent, int style) {
 }
 
 @Override
-long /*int*/ attributedSubstringFromRange (long /*int*/ id, long /*int*/ sel, long /*int*/ rangePtr) {
+long attributedSubstringFromRange (long id, long sel, long rangePtr) {
 	Event event = new Event ();
 	event.detail = SWT.COMPOSITION_SELECTION;
 	sendEvent (SWT.ImeComposition, event);
 	NSRange range = new NSRange ();
 	OS.memmove (range, rangePtr, NSRange.sizeof);
-	int start = (int)/*64*/range.location;
-	int end = (int)/*64*/(range.location + range.length);
+	int start = (int)range.location;
+	int end = (int)(range.location + range.length);
 	if (event.start <= start && start <= event.end && event.start <= end && end <= event.end) {
 		NSString str = (NSString) new NSString().alloc();
 		str = str.initWithString(event.text.substring(start - event.start, end - event.start));
@@ -110,7 +110,7 @@ long /*int*/ attributedSubstringFromRange (long /*int*/ id, long /*int*/ sel, lo
 }
 
 @Override
-long /*int*/ characterIndexForPoint (long /*int*/ id, long /*int*/ sel, long /*int*/ point) {
+long characterIndexForPoint (long id, long sel, long point) {
 	if (!isInlineEnabled ()) return OS.NSNotFound();
 	NSPoint pt = new NSPoint ();
 	OS.memmove (pt, point, NSPoint.sizeof);
@@ -136,7 +136,7 @@ void createWidget () {
 }
 
 @Override
-NSRect firstRectForCharacterRange(long /*int*/ id, long /*int*/ sel, long /*int*/ range) {
+NSRect firstRectForCharacterRange(long id, long sel, long range) {
 	NSRect rect = new NSRect ();
 	Caret caret = parent.caret;
 	if (caret != null) {
@@ -264,7 +264,7 @@ public TextStyle [] getStyles () {
 
 TextStyle getStyle (NSDictionary attribs) {
 	NSArray keys = attribs.allKeys ();
-	long /*int*/ count = keys.count ();
+	long count = keys.count ();
 	TextStyle style = new TextStyle ();
 	for (int j = 0; j < count; j++) {
 		NSString key = new NSString (keys.objectAtIndex (j));
@@ -339,18 +339,18 @@ public boolean getWideCaret() {
 }
 
 @Override
-boolean hasMarkedText (long /*int*/ id, long /*int*/ sel) {
+boolean hasMarkedText (long id, long sel) {
 	return text.length () != 0;
 }
 
 @Override
-boolean insertText (long /*int*/ id, long /*int*/ sel, long /*int*/ string) {
+boolean insertText (long id, long sel, long string) {
 	if (startOffset == -1) return true;
 	NSString str = new NSString (string);
 	if (str.isKindOfClass (OS.class_NSAttributedString)) {
 		str = new NSAttributedString (string).string ();
 	}
-	int length = (int)/*64*/str.length ();
+	int length = (int)str.length ();
 	int end = startOffset + text.length ();
 	resetStyles ();
 	caretOffset = commitCount = length;
@@ -371,7 +371,7 @@ boolean isInlineEnabled () {
 }
 
 @Override
-NSRange markedRange (long /*int*/ id, long /*int*/ sel) {
+NSRange markedRange (long id, long sel) {
 	NSRange range = new NSRange ();
 	if (startOffset != -1) {
 		range.location = startOffset;
@@ -409,7 +409,7 @@ void releaseWidget () {
 }
 
 @Override
-NSRange selectedRange (long /*int*/ id, long /*int*/ sel) {
+NSRange selectedRange (long id, long sel) {
 	Event event = new Event ();
 	event.detail = SWT.COMPOSITION_SELECTION;
 	sendEvent (SWT.ImeComposition, event);
@@ -444,7 +444,7 @@ public void setCompositionOffset (int offset) {
 }
 
 @Override
-boolean setMarkedText_selectedRange (long /*int*/ id, long /*int*/ sel, long /*int*/ string, long /*int*/ selRange) {
+boolean setMarkedText_selectedRange (long id, long sel, long string, long selRange) {
 	if (!isInlineEnabled ()) return true;
 	resetStyles ();
 	caretOffset = commitCount = 0;
@@ -460,19 +460,19 @@ boolean setMarkedText_selectedRange (long /*int*/ id, long /*int*/ sel, long /*i
 	if (str.isKindOfClass (OS.class_NSAttributedString)) {
 		NSAttributedString attribStr = new NSAttributedString (string);
 		str = attribStr.string ();
-		int length = (int)/*64*/str.length ();
+		int length = (int)str.length ();
 		styles = new TextStyle [length];
 		ranges = new int [length * 2];
 		NSRange rangeLimit = new NSRange (), effectiveRange = new NSRange ();
 		rangeLimit.length = length;
 		int rangeCount = 0;
-		long /*int*/ ptr = C.malloc (NSRange.sizeof);
+		long ptr = C.malloc (NSRange.sizeof);
 		for (int i = 0; i < length;) {
 			NSDictionary attribs = attribStr.attributesAtIndex(i, ptr, rangeLimit);
 			OS.memmove (effectiveRange, ptr, NSRange.sizeof);
-			i = (int)/*64*/(effectiveRange.location + effectiveRange.length);
-			ranges [rangeCount * 2] = (int)/*64*/effectiveRange.location;
-			ranges [rangeCount * 2 + 1] = (int)/*64*/(effectiveRange.location + effectiveRange.length - 1);
+			i = (int)(effectiveRange.location + effectiveRange.length);
+			ranges [rangeCount * 2] = (int)effectiveRange.location;
+			ranges [rangeCount * 2 + 1] = (int)(effectiveRange.location + effectiveRange.length - 1);
 			styles [rangeCount++] = getStyle (attribs);
 		}
 		C.free (ptr);
@@ -485,14 +485,14 @@ boolean setMarkedText_selectedRange (long /*int*/ id, long /*int*/ sel, long /*i
 			ranges = newRanges;
 		}
 	}
-	int length = (int)/*64*/str.length ();
+	int length = (int)str.length ();
 	if (ranges == null && length > 0) {
 		styles = new TextStyle []{getStyle (display.markedAttributes)};
 		ranges = new int[]{0, length - 1};
 	}
 	NSRange range = new NSRange ();
 	OS.memmove (range, selRange, NSRange.sizeof);
-	caretOffset = (int)/*64*/range.location;
+	caretOffset = (int)range.location;
 	Event event = new Event ();
 	event.detail = SWT.COMPOSITION_CHANGED;
 	event.start = startOffset;
@@ -510,7 +510,7 @@ boolean setMarkedText_selectedRange (long /*int*/ id, long /*int*/ sel, long /*i
 }
 
 @Override
-long /*int*/ validAttributesForMarkedText (long /*int*/ id, long /*int*/ sel) {
+long validAttributesForMarkedText (long id, long sel) {
 	NSMutableArray attribs = NSMutableArray.arrayWithCapacity (6);
 	attribs.addObject (new NSString (OS.NSForegroundColorAttributeName ()));
 	attribs.addObject (new NSString (OS.NSBackgroundColorAttributeName ()));
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java
index 02ad646f9c..54e555a90a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java
@@ -99,12 +99,12 @@ public Label (Composite parent, int style) {
 }
 
 @Override
-long /*int*/ accessibleHandle() {
+long accessibleHandle() {
 	return eventView().id;
 }
 
 @Override
-boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
+boolean accessibilityIsIgnored(long id, long sel) {
 	if (id == view.id) return true;
 	return super.accessibilityIsIgnored(id, sel);
 }
@@ -142,7 +142,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
 	int width = DEFAULT_WIDTH;
 	int height = DEFAULT_HEIGHT;
 	if ((style & SWT.SEPARATOR) != 0) {
-		double /*float*/ lineWidth = ((NSBox)view).borderWidth ();
+		double lineWidth = ((NSBox)view).borderWidth ();
 		if ((style & SWT.HORIZONTAL) != 0) {
 			height = (int)Math.ceil (lineWidth * 2);
 		} else {
@@ -205,7 +205,7 @@ void createHandle () {
 		widget.setBoxType (OS.NSBoxCustom);
 		widget.setContentViewMargins (new NSSize());
 
-		double /*float*/ lineWidth = widget.borderWidth ();
+		double lineWidth = widget.borderWidth ();
 		if ((style & SWT.HORIZONTAL) != 0) {
 			rect.height = (int)Math.ceil (lineWidth * 2);
 			rect.y = (DEFAULT_HEIGHT / 2) - (rect.height / 2);
@@ -293,13 +293,13 @@ void deregister () {
 }
 
 @Override
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rect) {
 	if (id != view.id) return;
 	fillBackground(view, context, rect, -1);
 }
 
 @Override
-long /*int*/ imageView() {
+long imageView() {
 	return imageView.id;
 };
 
@@ -458,7 +458,7 @@ void setFont(NSFont font) {
 }
 
 @Override
-void setForeground (double /*float*/ [] color) {
+void setForeground (double [] color) {
 	if ((style & SWT.SEPARATOR) != 0) return;
 	NSCell cell = new NSCell(textView.cell());
 	cell.setAttributedStringValue(createString());
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java
index f0481692ab..62827a3815 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java
@@ -48,7 +48,7 @@ public class Link extends Control {
 	Point [] offsets;
 	String [] ids;
 	int [] mnemonics;
-	double /*float*/ [] linkForeground;
+	double [] linkForeground;
 	NSColor defaultLinkColor;
 	int focusIndex;
 	boolean ignoreNextMouseUp;
@@ -223,7 +223,7 @@ void deregister () {
 }
 
 @Override
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rectangle) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rectangle) {
 	fillBackground (view, context, rectangle, -1);
 	if (!hasFocus() || focusIndex == -1) return;
 	int [] outMetric = new int [1];
@@ -317,13 +317,13 @@ NSRect[] getRectangles(int linkIndex) {
 	range.length = offsets[linkIndex].y - offsets[linkIndex].x + 1;
 	NSRange glyphRange = layoutManager.glyphRangeForCharacterRange(range, 0);
 
-	long /*int*/ rangePtr = C.malloc(NSRange.sizeof);
+	long rangePtr = C.malloc(NSRange.sizeof);
 	NSRange lineRange = new NSRange();
 
 	/* compute number of lines in the link */
 	int numberOfLines = 0;
-	long /*int*/ index = glyphRange.location;
-	long /*int*/ glyphEndIndex = glyphRange.location + glyphRange.length;
+	long index = glyphRange.location;
+	long glyphEndIndex = glyphRange.location + glyphRange.length;
 	while (index < glyphEndIndex) {
 		numberOfLines++;
 		layoutManager.lineFragmentUsedRectForGlyphAtIndex(index, rangePtr, true);
@@ -380,7 +380,7 @@ NSColor getTextColor (boolean enabled) {
 }
 
 @Override
-void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseUp(long id, long sel, long theEvent) {
 	/*
 	 * Feature in Cocoa: Link click notices are sent on mouseDown, but for some reason, Cocoa
 	 * re-sends the mouseUp that follows the click on a link. Fix is to ignore the next mouseUp
@@ -592,7 +592,7 @@ public void removeSelectionListener (SelectionListener listener) {
 }
 
 @Override
-void scrollWheel(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void scrollWheel(long id, long sel, long theEvent) {
 	super.scrollWheel(id, sel, theEvent);
 	parent.scrollWheel(parent.view.id, sel, theEvent);
 }
@@ -685,7 +685,7 @@ void setFont(NSFont font) {
 }
 
 @Override
-void setForeground (double /*float*/ [] color) {
+void setForeground (double [] color) {
 	if (!getEnabled ()) return;
 	((NSTextView) view).setTextColor (getTextColor (true));
 }
@@ -693,7 +693,7 @@ void setForeground (double /*float*/ [] color) {
 void setLinkColor (boolean enabled) {
 	NSTextView widget = (NSTextView) view;
 	NSDictionary linkTextAttributes = widget.linkTextAttributes ();
-	int count = (int)/*64*/linkTextAttributes.count ();
+	int count = (int)linkTextAttributes.count ();
 	NSMutableDictionary dict = NSMutableDictionary.dictionaryWithCapacity (count);
 	dict.setDictionary (linkTextAttributes);
 	dict.setValue (enabled ? getLinkForegroundColor () : getTextColor (false), OS.NSForegroundColorAttributeName);
@@ -723,7 +723,7 @@ public void setLinkForeground (Color color) {
 	if (color != null) {
 		if (color.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	}
-	double /*float*/ [] linkForeground = color != null ? color.handle : null;
+	double [] linkForeground = color != null ? color.handle : null;
 	if (equals (linkForeground, this.linkForeground)) return;
 	this.linkForeground = linkForeground;
 	if (getEnabled ()) {
@@ -804,12 +804,12 @@ void setZOrder () {
 }
 
 @Override
-boolean shouldDrawInsertionPoint(long /*int*/ id, long /*int*/ sel) {
+boolean shouldDrawInsertionPoint(long id, long sel) {
 	return false;
 }
 
 @Override
-boolean textView_clickOnLink_atIndex(long /*int*/ id, long /*int*/ sel, long /*int*/ textView, long /*int*/ link, long /*int*/ charIndex) {
+boolean textView_clickOnLink_atIndex(long id, long sel, long textView, long link, long charIndex) {
 	NSString str = new NSString (link);
 	Event event = new Event ();
 	event.text = str.getString();
@@ -837,7 +837,7 @@ int traversalCode (int key, NSEvent theEvent) {
 	if (offsets.length == 0) return  0;
 	int bits = super.traversalCode (key, theEvent);
 	if (key == 48 /* Tab */ && theEvent != null) {
-		long /*int*/ modifierFlags = theEvent.modifierFlags();
+		long modifierFlags = theEvent.modifierFlags();
 		boolean next = (modifierFlags & OS.NSShiftKeyMask) == 0;
 		if (next && focusIndex < offsets.length - 1) {
 			return bits & ~ SWT.TRAVERSE_TAB_NEXT;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java
index 1bafa3831d..d5c387e2f1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java
@@ -84,7 +84,7 @@ public List (Composite parent, int style) {
 }
 
 @Override
-long /*int*/ accessibilityAttributeValue (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+long accessibilityAttributeValue (long id, long sel, long arg0) {
 //	if (attributeName.isEqualToString(OS.NSAccessibilityHeaderAttribute)) {
 //		/*
 //		* Bug in the Macintosh.  Even when the header is not visible,
@@ -100,7 +100,7 @@ long /*int*/ accessibilityAttributeValue (long /*int*/ id, long /*int*/ sel, lon
 }
 
 @Override
-boolean acceptsFirstResponder (long /*int*/ id, long /*int*/ sel) {
+boolean acceptsFirstResponder (long id, long sel) {
 	return true;
 }
 
@@ -404,7 +404,7 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) {
 	NSPoint pt = new NSPoint();
 	pt.x = x;
 	pt.y = y;
-	long /*int*/ row = widget.rowAtPoint(pt);
+	long row = widget.rowAtPoint(pt);
 	if (row == -1) return false;
 	boolean dragging = super.dragDetect(x, y, filter, consume);
 	if (dragging) {
@@ -421,7 +421,7 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) {
 }
 
 @Override
-void drawBackgroundInClipRect(long /*int*/ id, long /*int*/ sel, NSRect rect) {
+void drawBackgroundInClipRect(long id, long sel, NSRect rect) {
 	super.drawViewBackgroundInRect(id, sel, rect);
 	if (id != view.id) return;
 	fillBackground (view, NSGraphicsContext.currentContext(), rect, -1);
@@ -460,7 +460,7 @@ void fixSelection (int index, boolean add) {
  */
 public int getFocusIndex () {
 	checkWidget();
-	return (int)/*64*/((NSTableView)view).selectedRow();
+	return (int)((NSTableView)view).selectedRow();
 }
 
 /**
@@ -561,12 +561,12 @@ public String [] getSelection () {
 		return new String [0];
 	}
 	NSIndexSet selection = widget.selectedRowIndexes();
-	int count = (int)/*64*/selection.count();
-	long /*int*/ [] indexBuffer = new long /*int*/ [count];
+	int count = (int)selection.count();
+	long [] indexBuffer = new long [count];
 	selection.getIndexes(indexBuffer, count, 0);
 	String [] result = new String  [count];
 	for (int i=0; i<count; i++) {
-		result [i] = items [(int)/*64*/indexBuffer [i]];
+		result [i] = items [(int)indexBuffer [i]];
 	}
 	return result;
 }
@@ -583,7 +583,7 @@ public String [] getSelection () {
  */
 public int getSelectionCount () {
 	checkWidget ();
-	return (int)/*64*/((NSTableView)view).numberOfSelectedRows();
+	return (int)((NSTableView)view).numberOfSelectedRows();
 }
 
 /**
@@ -604,10 +604,10 @@ public int getSelectionIndex () {
 		return -1;
 	}
 	NSIndexSet selection = widget.selectedRowIndexes();
-	int count = (int)/*64*/selection.count();
-	long /*int*/ [] result = new long /*int*/ [count];
+	int count = (int)selection.count();
+	long [] result = new long [count];
 	selection.getIndexes(result, count, 0);
-	return (int)/*64*/result [0];
+	return (int)result [0];
 }
 
 /**
@@ -633,12 +633,12 @@ public int [] getSelectionIndices () {
 		return new int [0];
 	}
 	NSIndexSet selection = widget.selectedRowIndexes();
-	int count = (int)/*64*/selection.count();
-	long /*int*/ [] indices = new long /*int*/ [count];
+	int count = (int)selection.count();
+	long [] indices = new long [count];
 	selection.getIndexes(indices, count, 0);
 	int [] result = new int [count];
 	for (int i = 0; i < result.length; i++) {
-		result [i] = (int)/*64*/indices [i];
+		result [i] = (int)indices [i];
 	}
 	return result;
 }
@@ -662,7 +662,7 @@ public int getTopIndex () {
 	NSPoint point = new NSPoint();
 	point.x = rect.x;
 	point.y = rect.y;
-    int result = (int)/*64*/((NSTableView)view).rowAtPoint(point);
+    int result = (int)((NSTableView)view).rowAtPoint(point);
     if (result == -1) result = 0;
     return result;
 }
@@ -748,7 +748,7 @@ public boolean isSelected (int index) {
  * clicked-on row ourselves.
  */
 @Override
-long /*int*/ menuForEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+long menuForEvent(long id, long sel, long theEvent) {
 	if (display.lastHandledMenuForEventId == theEvent) return 0;
 	NSEvent event = new NSEvent(theEvent);
 	NSTableView table = (NSTableView)view;
@@ -758,7 +758,7 @@ long /*int*/ menuForEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ theEve
 
 	// select the row that was clicked before showing the menu for the event
 	NSPoint mousePoint = view.convertPoint_fromView_(event.locationInWindow(), null);
-	long /*int*/ row = table.rowAtPoint(mousePoint);
+	long row = table.rowAtPoint(mousePoint);
 
 	// figure out if the row that was just clicked on is currently selected
 	if (selectedRowIndexes.containsIndex(row) == false) {
@@ -773,12 +773,12 @@ long /*int*/ menuForEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ theEve
 }
 
 @Override
-void mouseDownSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDownSuper(long id, long sel, long theEvent) {
 	ignoreSelect = false;
 	NSTableView widget = (NSTableView)view;
 	NSEvent nsEvent = new NSEvent(theEvent);
 	NSPoint pt = view.convertPoint_fromView_(nsEvent.locationInWindow(), null);
-	int row = (int)/*64*/widget.rowAtPoint(pt);
+	int row = (int)widget.rowAtPoint(pt);
 	if (row != -1 && (nsEvent.modifierFlags() & OS.NSDeviceIndependentModifierFlagsMask) == 0 && nsEvent.clickCount() == 1) {
 		if (widget.isRowSelected(row) && widget.selectedRowIndexes().count() == 1) {
 			if (0 <= row && row < itemCount) {
@@ -792,12 +792,12 @@ void mouseDownSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-boolean needsPanelToBecomeKey (long /*int*/ id, long /*int*/ sel) {
+boolean needsPanelToBecomeKey (long id, long sel) {
 	return false;
 }
 
 @Override
-long /*int*/ numberOfRowsInTableView(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView) {
+long numberOfRowsInTableView(long id, long sel, long aTableView) {
 	return itemCount;
 }
 
@@ -1142,7 +1142,7 @@ boolean sendKeyEvent (NSEvent nsEvent, int type) {
 boolean sendMouseEvent (NSEvent nsEvent, int type, boolean send) {
 	boolean handleMouseDown = true;
 	if (nsEvent != null) {
-		long /*int*/ nsType = nsEvent.type();
+		long nsType = nsEvent.type();
 		handleMouseDown = nsType == OS.NSLeftMouseDown || nsType == OS.NSLeftMouseUp;
 	}
 	if (handleMouseDown) {
@@ -1174,8 +1174,8 @@ void setBackgroundColor(NSColor nsColor) {
 @Override
 void setFont (NSFont font) {
 	super.setFont (font);
-	double /*float*/ ascent = font.ascender ();
-	double /*float*/ descent = -font.descender () + font.leading ();
+	double ascent = font.ascender ();
+	double descent = -font.descender () + font.leading ();
 	((NSTableView)view).setRowHeight ((int)Math.ceil (ascent + descent) + 1);
 	setScrollWidth();
 }
@@ -1241,7 +1241,7 @@ boolean setScrollWidth (String item) {
 	cell.setFont (font.handle);
 	cell.setTitle (NSString.stringWith (item));
 	NSSize size = cell.cellSize ();
-	double /*float*/ oldWidth = column.width ();
+	double oldWidth = column.width ();
 	if (oldWidth < size.width) {
 		column.setWidth (size.width);
 		return true;
@@ -1255,7 +1255,7 @@ boolean setScrollWidth () {
 	NSCell cell = column.dataCell ();
 	Font font = this.font != null ? this.font : defaultFont ();
 	cell.setFont (font.handle);
-	double /*float*/ width = 0;
+	double width = 0;
 	for (int i = 0; i < itemCount; i++) {
 		cell.setTitle (NSString.stringWith (items[i]));
 		NSSize size = cell.cellSize ();
@@ -1483,26 +1483,26 @@ public void showSelection () {
 }
 
 @Override
-void tableViewSelectionDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void tableViewSelectionDidChange (long id, long sel, long aNotification) {
 	if (didSelect) return;
 	sendSelection();
 }
 
 @Override
-void tableViewSelectionIsChanging (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void tableViewSelectionIsChanging (long id, long sel, long aNotification) {
 	didSelect = true;
 	sendSelection();
 }
 
 @Override
-long /*int*/ tableView_objectValueForTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
-	double /*float*/ [] fg = ((NSTableView)view).isRowSelected(rowIndex) ? null : foreground;
-	NSAttributedString attribStr = createString(items[(int)/*64*/rowIndex], null, fg, SWT.LEFT, false, getEnabled(), false);
+long tableView_objectValueForTableColumn_row(long id, long sel, long aTableView, long aTableColumn, long rowIndex) {
+	double [] fg = ((NSTableView)view).isRowSelected(rowIndex) ? null : foreground;
+	NSAttributedString attribStr = createString(items[(int)rowIndex], null, fg, SWT.LEFT, false, getEnabled(), false);
 	attribStr.autorelease();
 	return attribStr.id;
 }
 
-long /*int*/ tableView_selectionIndexesForProposedSelection (long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ indexSet) {
+long tableView_selectionIndexesForProposedSelection (long id, long sel, long aTableView, long indexSet) {
 	if ((style & SWT.SINGLE) != 0) {
 		/*
 		 * Feature in Cocoa.  Calling setAllowsEmptySelection will automatically select the first row of the list.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java
index 8c7a2538c2..fe5781d32d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java
@@ -339,8 +339,8 @@ void createHandle () {
 		nsMenu = widget;
 	} else {
 		nsMenu.retain();
-		long /*int*/ cls = OS.object_getClass(nsMenu.id);
-		long /*int*/ dynNSMenu_class = display.createMenuSubclass(cls, "SWTSystemMenu", true);
+		long cls = OS.object_getClass(nsMenu.id);
+		long dynNSMenu_class = display.createMenuSubclass(cls, "SWTSystemMenu", true);
 		if (cls != dynNSMenu_class) {
 			OS.object_setClass(nsMenu.id, dynNSMenu_class);
 		}
@@ -365,8 +365,8 @@ void createItem (MenuItem item, int index) {
 		}
 		item.nsItem = nsItem;
 	} else {
-		long /*int*/ cls = OS.object_getClass(nsItem.id);
-		long /*int*/ dynNSMenuItem_class = display.createMenuItemSubclass(cls, "SWTSystemMenuItem", true);
+		long cls = OS.object_getClass(nsItem.id);
+		long dynNSMenuItem_class = display.createMenuItemSubclass(cls, "SWTSystemMenuItem", true);
 		if (cls != dynNSMenuItem_class) {
 			OS.object_setClass(nsItem.id, dynNSMenuItem_class);
 		}
@@ -388,9 +388,9 @@ void createItem (MenuItem item, int index) {
 		// Sync native key equivalent to MenuItem's accelerator.
 		// The system menu on OS X only uses command and option, so it's
 		// safe to just check for those two key masks.
-		long /*int*/ keyMask = nsItem.keyEquivalentModifierMask();
+		long keyMask = nsItem.keyEquivalentModifierMask();
 		NSString keyEquivString = nsItem.keyEquivalent();
-		long /*int*/ keyEquiv = 0;
+		long keyEquiv = 0;
 		if (keyEquivString != null) {
 			keyEquiv = keyEquivString.characterAtIndex(0);
 			if ((keyMask & OS.NSCommandKeyMask) != 0) keyEquiv |= SWT.COMMAND;
@@ -788,7 +788,7 @@ public boolean isVisible () {
 }
 
 @Override
-void menu_willHighlightItem(long /*int*/ id, long /*int*/ sel, long /*int*/ menu, long /*int*/ itemID) {
+void menu_willHighlightItem(long id, long sel, long menu, long itemID) {
 	Widget widget = display.getWidget(itemID);
 	if (widget instanceof MenuItem) {
 		MenuItem item = (MenuItem)widget;
@@ -797,24 +797,24 @@ void menu_willHighlightItem(long /*int*/ id, long /*int*/ sel, long /*int*/ menu
 }
 
 @Override
-void menuNeedsUpdate(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
+void menuNeedsUpdate(long id, long sel, long menu) {
 	//This code is intentionally commented
 	//sendEvent (SWT.Show);
 }
 
 @Override
-void menuWillOpen(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
+void menuWillOpen(long id, long sel, long menu) {
 	visible = true;
 	sendEvent (SWT.Show);
 	if (isDisposed()) return;
-	double /*float*/ width = 0;
+	double width = 0;
 	NSAttributedString[] strs = new NSAttributedString[itemCount];
 	for (int i=0; i<itemCount; i++) {
 		MenuItem item = items [i];
 		NSMenuItem nsItem = item.nsItem;
 		strs[i] = nsItem.attributedTitle();
 		NSImage nsImage = nsItem.image();
-		double /*float*/ w = GAP;
+		double w = GAP;
 		if (strs[i] != null) {
 			w += strs[i].size().width;
 		}
@@ -834,7 +834,7 @@ void menuWillOpen(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
 			if (length > 1) {
 				NSMenuItem nsItem = item.nsItem;
 				NSImage nsImage = nsItem.image();
-				double /*float*/ tab = width;
+				double tab = width;
 				if (nsImage != null) {
 					tab -= (nsImage.size().width + GAP);
 				}
@@ -871,7 +871,7 @@ void menuWillOpen(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
 }
 
 @Override
-void menuDidClose(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
+void menuDidClose(long id, long sel, long menu) {
 	sendEvent (SWT.Hide);
 	if (isDisposed()) return;
 	visible = false;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java
index 6f4a155a2a..f1cc69ec6a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java
@@ -42,7 +42,7 @@ public class MenuItem extends Item {
 	NSMenuItem nsItem;
 	Menu parent, menu;
 	int accelerator;
-	long /*int*/ nsItemAction;
+	long nsItemAction;
 	id nsItemTarget;
 	String toolTipText;
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java
index 021d7e5e14..bd01a5394d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java
@@ -210,7 +210,7 @@ public int open () {
 	NSString message = NSString.stringWith(this.message != null ? this.message : "");
 	alert.setMessageText(message);
 	int response = 0;
-	long /*int*/ jniRef = 0;
+	long jniRef = 0;
 	SWTPanelDelegate delegate = null;
 	Display display = parent != null ? parent.getDisplay() : Display.getCurrent();
 	if ((style & SWT.SHEET) != 0) {
@@ -221,7 +221,7 @@ public int open () {
 		alert.beginSheetModalForWindow(parent.view.window (), delegate, OS.sel_panelDidEnd_returnCode_contextInfo_, 0);
 		display.setModalDialog(this, panel);
 		if ((style & SWT.APPLICATION_MODAL) != 0) {
-			response = (int)/*64*/alert.runModal();
+			response = (int)alert.runModal();
 		} else {
 			this.returnCode = 0;
 			NSWindow window = alert.window();
@@ -232,7 +232,7 @@ public int open () {
 		}
 	} else {
 		display.setModalDialog(this, panel);
-		response = (int)/*64*/alert.runModal();
+		response = (int)alert.runModal();
 	}
 	display.setModalDialog(null);
 	if (delegate != null) delegate.release();
@@ -311,8 +311,8 @@ public int open () {
 	return SWT.CANCEL;
 }
 
-void panelDidEnd_returnCode_contextInfo(long /*int*/ id, long /*int*/ sel, long /*int*/ alert, long /*int*/ returnCode, long /*int*/ contextInfo) {
-	this.returnCode = (int)/*64*/returnCode;
+void panelDidEnd_returnCode_contextInfo(long id, long sel, long alert, long returnCode, long contextInfo) {
+	this.returnCode = (int)returnCode;
 	NSApplication application = NSApplication.sharedApplication();
 	application.endSheet(new NSAlert(alert).window(), returnCode);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java
index 5b11660327..14cb1b77c0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java
@@ -117,7 +117,7 @@ NSFont defaultNSFont () {
 }
 
 @Override
-void _drawThemeProgressArea (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void _drawThemeProgressArea (long id, long sel, long arg0) {
 	/*
 	* Bug in Cocoa.  When the threaded animation is turned off by calling
 	* setUsesThreadedAnimation(), _drawThemeProgressArea() attempts to
@@ -135,7 +135,7 @@ void _drawThemeProgressArea (long /*int*/ id, long /*int*/ sel, long /*int*/ arg
 	* region of the progress bar before calling super.
 	*/
 	if (visiblePath == null) {
-		long /*int*/ visibleRegion = getVisibleRegion();
+		long visibleRegion = getVisibleRegion();
 		visiblePath = getPath(visibleRegion);
 		OS.DisposeRgn(visibleRegion);
 	}
@@ -329,7 +329,7 @@ void resetVisibleRegion () {
 }
 
 @Override
-void viewDidMoveToWindow(long /*int*/ id, long /*int*/ sel) {
+void viewDidMoveToWindow(long id, long sel) {
 	/*
 	 * Bug in Cocoa. An indeterminate progress indicator doesn't start animating until it is in
 	 * a visible window.  Workaround is to catch when the bar has been added to a window and start
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java
index add19e25fb..29ad16ad69 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java
@@ -85,7 +85,7 @@ public Sash (Composite parent, int style) {
 }
 
 @Override
-long /*int*/ accessibilityAttributeNames(long /*int*/ id, long /*int*/ sel) {
+long accessibilityAttributeNames(long id, long sel) {
 	if (accessibilityAttributes == null) {
 		NSMutableArray ourAttributes = NSMutableArray.arrayWithCapacity(10);
 		ourAttributes.addObject(OS.NSAccessibilityRoleAttribute);
@@ -113,7 +113,7 @@ long /*int*/ accessibilityAttributeNames(long /*int*/ id, long /*int*/ sel) {
 			extraAttributes.addObject(OS.NSAccessibilityDescriptionAttribute);
 			extraAttributes.addObject(OS.NSAccessibilityTitleAttribute);
 
-			for (int i = (int)/*64*/extraAttributes.count() - 1; i >= 0; i--) {
+			for (int i = (int)extraAttributes.count() - 1; i >= 0; i--) {
 				NSString attribute = new NSString(extraAttributes.objectAtIndex(i).id);
 				if (accessible.internal_accessibilityAttributeValue(attribute, ACC.CHILDID_SELF) != null) {
 					ourAttributes.addObject(extraAttributes.objectAtIndex(i));
@@ -129,8 +129,8 @@ long /*int*/ accessibilityAttributeNames(long /*int*/ id, long /*int*/ sel) {
 }
 
 @Override
-long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
-	long /*int*/ returnValue = 0;
+long accessibilityAttributeValue(long id, long sel, long arg0) {
+	long returnValue = 0;
 	NSString attributeName = new NSString(arg0);
 
 	if (accessible != null) {
@@ -160,7 +160,7 @@ long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long
 		return NSNumber.numberWithInt(value).id;
 	} else if (attributeName.isEqualToString (OS.NSAccessibilityMaxValueAttribute)) {
 		NSRect parentFrame = parent.topView().frame();
-		double /*float*/ maxValue = (style & SWT.VERTICAL) != 0 ?
+		double maxValue = (style & SWT.VERTICAL) != 0 ?
 							parentFrame.width :
 							parentFrame.height;
 		return NSNumber.numberWithDouble(maxValue).id;
@@ -204,7 +204,7 @@ long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long
 }
 
 @Override
-boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
+boolean accessibilityIsIgnored(long id, long sel) {
 	return false;
 }
 
@@ -250,7 +250,7 @@ static int checkStyle (int style) {
 }
 
 @Override
-boolean becomeFirstResponder (long /*int*/ id, long /*int*/ sel) {
+boolean becomeFirstResponder (long id, long sel) {
 	boolean result = super.becomeFirstResponder(id, sel);
 	NSRect frame = view.frame();
 	lastX = (int)frame.x;
@@ -281,7 +281,7 @@ void createHandle () {
 }
 
 @Override
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rect) {
 	if (id != view.id) return;
 	fillBackground (view, context, rect, -1);
 }
@@ -308,7 +308,7 @@ boolean sendKeyEvent(NSEvent nsEvent, int type) {
 			case 124: /* Right arrow */ {
 				int xChange = 0, yChange = 0;
 				int stepSize = PAGE_INCREMENT;
-				long /*int*/ modifiers = nsEvent.modifierFlags();
+				long modifiers = nsEvent.modifierFlags();
 				if ((modifiers & OS.NSControlKeyMask) != 0) stepSize = INCREMENT;
 				if ((style & SWT.VERTICAL) != 0) {
 					if (keyCode == 126 || keyCode == 125) break;
@@ -359,7 +359,7 @@ boolean sendKeyEvent(NSEvent nsEvent, int type) {
 }
 
 @Override
-void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDown(long id, long sel, long theEvent) {
 	//TODO use sendMouseEvent
 	super.mouseDown(id, sel, theEvent);
 	if (isDisposed()) return;
@@ -386,13 +386,13 @@ void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-boolean mouseEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent, int type) {
+boolean mouseEvent (long id, long sel, long theEvent, int type) {
 	super.mouseEvent (id, sel, theEvent, type);
 	return new NSEvent (theEvent).type () != OS.NSLeftMouseDown;
 }
 
 @Override
-void mouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDragged(long id, long sel, long theEvent) {
 	//TODO use sendMouseEvent
 	super.mouseDragged(id, sel, theEvent);
 	if (isDisposed()) return;
@@ -424,7 +424,7 @@ void mouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseUp(long id, long sel, long theEvent) {
 	//TODO use sendMouseEvent
 	super.mouseUp(id, sel, theEvent);
 	if (isDisposed()) return;
@@ -483,11 +483,11 @@ public void removeSelectionListener(SelectionListener listener) {
 }
 
 @Override
-void superKeyDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void superKeyDown (long id, long sel, long theEvent) {
 }
 
 @Override
-void superKeyUp (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void superKeyUp (long id, long sel, long theEvent) {
 }
 
 @Override
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java
index f3b3cd1931..67776cf140 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java
@@ -117,7 +117,7 @@ static int checkStyle (int style) {
 public Point computeSize (int wHint, int hHint, boolean changed) {
 	checkWidget();
 	NSSlider widget = (NSSlider)view;
-	double /*float*/ thickness = widget.knobThickness();
+	double thickness = widget.knobThickness();
 	int width = DEFAULT_WIDTH, height = DEFAULT_HEIGHT;
 	if ((style & SWT.HORIZONTAL) != 0) {
 		height = (int)Math.ceil(thickness);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java
index b109579866..29e72b1b87 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java
@@ -93,7 +93,7 @@ public class ScrollBar extends Widget {
 	int increment = 1;
 	int pageIncrement = 10;
 	id target;
-	long /*int*/ actionSelector;
+	long actionSelector;
 
 ScrollBar () {
 	/* Do nothing */
@@ -482,7 +482,7 @@ void sendSelection () {
 	} else {
 		point = window.mouseLocationOutsideOfEventStream();
 	}
-	int hitPart = (int)/*64*/((NSScroller)view).testPart(point);
+	int hitPart = (int)((NSScroller)view).testPart(point);
 	Event event = new Event();
 	switch (hitPart) {
 	case OS.NSScrollerDecrementLine:
@@ -743,7 +743,7 @@ void updateBar (int selection, int minimum, int maximum, int thumb) {
 	float fraction = range <= 0 ? 1 : (float) (selection - minimum) / range;
 	float knob = range <= 0 ? 1 : (float) thumb / (maximum - minimum);
 	double oldFraction = widget.doubleValue();
-	double /*float*/ oldKnob = widget.knobProportion();
+	double oldKnob = widget.knobProportion();
 	widget.setDoubleValue(fraction);
 	widget.setKnobProportion(knob);
 	widget.setEnabled (range > 0);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java
index 453b1bfd05..80224d21e0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java
@@ -137,7 +137,7 @@ ScrollBar createScrollBar (int style) {
 	bar.style = style;
 	bar.display = display;
 	NSScroller scroller;
-	long /*int*/ actionSelector;
+	long actionSelector;
 	NSRect rect = new NSRect();
 	if ((style & SWT.H_SCROLL) != 0) {
 		rect.width = 1;
@@ -279,7 +279,7 @@ boolean hooksKeys () {
 }
 
 @Override
-boolean isEventView (long /*int*/ id) {
+boolean isEventView (long id) {
 	return id == eventView ().id;
 }
 
@@ -307,7 +307,7 @@ void redrawBackgroundImage () {
 }
 
 @Override
-void reflectScrolledClipView(long /*int*/ id, long /*int*/ sel, long /*int*/ aClipView) {
+void reflectScrolledClipView(long id, long sel, long aClipView) {
 	super.reflectScrolledClipView(id, sel, aClipView);
 	redrawBackgroundImage();
 }
@@ -346,7 +346,7 @@ void reskinChildren (int flags) {
 }
 
 @Override
-void scrollClipViewToPoint (long /*int*/ id, long /*int*/ sel, long /*int*/ clipView, NSPoint point) {
+void scrollClipViewToPoint (long id, long sel, long clipView, NSPoint point) {
 	if ((state & CANVAS) == 0 && scrollView != null) {
 		NSClipView clip = new NSClipView (clipView);
 		boolean oldCopies = clip.copiesOnScroll (), copies = oldCopies;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
index 3427209b4c..9ef1cabb70 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
@@ -124,9 +124,9 @@ import org.eclipse.swt.internal.cocoa.*;
 public class Shell extends Decorations {
 	NSWindow window;
 	SWTWindowDelegate windowDelegate;
-	long /*int*/ hostWindowClass;
+	long hostWindowClass;
 	NSWindow hostWindow;
-	long /*int*/ tooltipOwner, tooltipTag, tooltipUserData;
+	long tooltipOwner, tooltipTag, tooltipUserData;
 	int glContextCount;
 	boolean opened, moved, resized, fullScreen, center, deferFlushing, scrolling, isPopup;
 	Control lastActive;
@@ -271,7 +271,7 @@ public Shell (Display display, int style) {
 	this (display, null, style, 0, false);
 }
 
-Shell (Display display, Shell parent, int style, long /*int*/handle, boolean embedded) {
+Shell (Display display, Shell parent, int style, long handle, boolean embedded) {
 	super ();
 	checkSubclass ();
 	if (display == null) display = Display.getCurrent ();
@@ -398,7 +398,7 @@ public Shell (Shell parent, int style) {
  *
  * @since 3.3
  */
-public static Shell internal_new (Display display, long /*int*/ handle) {
+public static Shell internal_new (Display display, long handle) {
 	return new Shell (display, null, SWT.NO_TRIM, handle, false);
 }
 
@@ -422,7 +422,7 @@ public static Shell internal_new (Display display, long /*int*/ handle) {
  *
  * @since 3.5
  */
-public static Shell cocoa_new (Display display, long /*int*/ handle) {
+public static Shell cocoa_new (Display display, long handle) {
 	return new Shell (display, null, SWT.NO_TRIM, handle, true);
 }
 
@@ -453,7 +453,7 @@ static int checkStyle (Shell parent, int style) {
 }
 
 @Override
-boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
+boolean accessibilityIsIgnored(long id, long sel) {
 	// The content view of a shell is always ignored.
 	if (id == view.id) return true;
 	return super.accessibilityIsIgnored(id, sel);
@@ -491,12 +491,12 @@ public void addShellListener(ShellListener listener) {
 
 void attachObserversToWindow(NSWindow newWindow) {
 	if (newWindow == null || newWindow.id == 0) return;
-	long /*int*/ newHostWindowClass = OS.object_getClass(newWindow.id);
-	long /*int*/ sendEventImpl = OS.class_getMethodImplementation(newHostWindowClass, OS.sel_sendEvent_);
+	long newHostWindowClass = OS.object_getClass(newWindow.id);
+	long sendEventImpl = OS.class_getMethodImplementation(newHostWindowClass, OS.sel_sendEvent_);
 	if (sendEventImpl == Display.windowCallback3.getAddress()) return;
 	hostWindow = newWindow;
 	hostWindow.retain();
-	long /*int*/ embeddedSubclass = display.createWindowSubclass(newHostWindowClass, "SWTAWTWindow", true);
+	long embeddedSubclass = display.createWindowSubclass(newHostWindowClass, "SWTAWTWindow", true);
 	OS.object_setClass(hostWindow.id, embeddedSubclass);
 	display.addWidget (hostWindow, this);
 	hostWindowClass = newHostWindowClass;
@@ -522,7 +522,7 @@ void attachObserversToWindow(NSWindow newWindow) {
 }
 
 @Override
-void becomeKeyWindow (long /*int*/ id, long /*int*/ sel) {
+void becomeKeyWindow (long id, long sel) {
 	Shell modal = getModalShell();
 	if (modal != null && modal.window != null) {
 		modal.window.makeKeyAndOrderFront(null);
@@ -546,7 +546,7 @@ void bringToTop (boolean force) {
 }
 
 @Override
-boolean canBecomeKeyWindow (long /*int*/ id, long /*int*/ sel) {
+boolean canBecomeKeyWindow (long id, long sel) {
 	if (isPopup) return false;
 	// Only answer if SWT created the window.
 	if (window != null) {
@@ -560,7 +560,7 @@ boolean canBecomeKeyWindow (long /*int*/ id, long /*int*/ sel) {
 				}
 			}
 		}
-		long /*int*/ styleMask = window.styleMask();
+		long styleMask = window.styleMask();
 		if (styleMask == OS.NSBorderlessWindowMask || (styleMask & (OS.NSNonactivatingPanelMask | OS.NSDocModalWindowMask | OS.NSResizableWindowMask)) != 0) return true;
 	}
 	return super.canBecomeKeyWindow (id, sel);
@@ -592,7 +592,7 @@ void center () {
 }
 
 @Override
-void clearDeferFlushing (long /*int*/ id, long /*int*/ sel) {
+void clearDeferFlushing (long id, long sel) {
 	deferFlushing = false;
 	scrolling = false;
 	if (window != null) window.flushWindowIfNeeded();
@@ -648,7 +648,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
 	rect.height = trim.height;
 	if (window != null) {
 		if (!_getFullScreen() && !fixResize()) {
-			double /*float*/ h = rect.height;
+			double h = rect.height;
 			rect = window.frameRectForContentRect(rect);
 			rect.y += h-rect.height;
 		}
@@ -721,7 +721,7 @@ void createHandle () {
 		}
 		display.cascadeWindow(window, screen);
 		NSRect screenFrame = screen.frame();
-		double /*float*/ width = screenFrame.width * 5 / 8, height = screenFrame.height * 5 / 8;;
+		double width = screenFrame.width * 5 / 8, height = screenFrame.height * 5 / 8;;
 		NSRect frame = window.frame();
 		NSRect primaryFrame = primaryScreen.frame();
 		frame.y = primaryFrame.height - ((primaryFrame.height - (frame.y + frame.height)) + height);
@@ -842,7 +842,7 @@ void destroyWidget () {
 }
 
 @Override
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rect) {
 	if (id != view.id) return;
 	if (regionPath != null && background == null) {
 		context.saveGraphicsState();
@@ -945,7 +945,7 @@ public Rectangle getBounds () {
 	checkWidget();
 	if (window != null) {
 		NSRect frame = window.frame();
-		double /*float*/ y = display.getPrimaryFrame().height - (int)(frame.y + frame.height);
+		double y = display.getPrimaryFrame().height - (int)(frame.y + frame.height);
 		return new Rectangle ((int)frame.x, (int)y, (int)frame.width, (int)frame.height);
 	} else {
 		NSRect frame = view.frame();
@@ -1041,7 +1041,7 @@ public Point getLocation () {
 
 	if (window != null) {
 		NSRect frame = window.frame();
-		double /*float*/ y = display.getPrimaryFrame().height - (int)(frame.y + frame.height);
+		double y = display.getPrimaryFrame().height - (int)(frame.y + frame.height);
 		return new Point ((int)frame.x, (int)y);
 	} else {
 		// Start from view's origin, (0, 0)
@@ -1249,7 +1249,7 @@ boolean hasRegion () {
 }
 
 @Override
-void helpRequested(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void helpRequested(long id, long sel, long theEvent) {
 	Control control = display.getFocusControl();
 	while (control != null) {
 		if (control.hooks (SWT.Help)) {
@@ -1300,7 +1300,7 @@ public boolean isVisible () {
 }
 
 @Override
-boolean makeFirstResponder (long /*int*/ id, long /*int*/ sel, long /*int*/ responder) {
+boolean makeFirstResponder (long id, long sel, long responder) {
 	Display display = this.display;
 	boolean result = super.makeFirstResponder(id, sel, responder);
 	if (!display.isDisposed()) display.checkFocus();
@@ -1325,7 +1325,7 @@ void makeKeyAndOrderFront() {
 }
 
 @Override
-void mouseMoved(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseMoved(long id, long sel, long theEvent) {
 	super.mouseMoved(id, sel, theEvent);
 
 	/**
@@ -1341,7 +1341,7 @@ void mouseMoved(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-void noResponderFor(long /*int*/ id, long /*int*/ sel, long /*int*/ selector) {
+void noResponderFor(long id, long sel, long selector) {
 	/**
 	 * Feature in Cocoa.  If the selector is keyDown and nothing has handled the event
 	 * a system beep is generated.  There's no need to beep, as many keystrokes in the SWT
@@ -1543,7 +1543,7 @@ void sendToolTipEvent (boolean enter) {
 			if (userInfo != null) {
 				tooltipUserData = userInfo.id;
 			} else {
-				long /*int*/ [] value = new long /*int*/ [1];
+				long [] value = new long [1];
 				OS.object_getInstanceVariable(tooltipTag, new byte[]{'_','u', 's', 'e', 'r', 'I', 'n', 'f', 'o'}, value);
 				tooltipUserData = value[0];
 			}
@@ -1766,7 +1766,7 @@ public void setFullScreen (boolean fullScreen) {
 		fullScreenFrame = NSScreen.mainScreen().frame();
 		if (getMonitor().equals(display.getPrimaryMonitor ())) {
 			if (menuBar != null) {
-				double /*float*/ menuBarHt = NSStatusBar.systemStatusBar().thickness();
+				double menuBarHt = NSStatusBar.systemStatusBar().thickness();
 				fullScreenFrame.height -= menuBarHt;
 				OS.SetSystemUIMode(OS.kUIModeContentHidden, 0);
 			}
@@ -2204,7 +2204,7 @@ void updateSystemUIMode () {
 }
 
 @Override
-long /*int*/ view_stringForToolTip_point_userData (long /*int*/ id, long /*int*/ sel, long /*int*/ view, long /*int*/ tag, long /*int*/ point, long /*int*/ userData) {
+long view_stringForToolTip_point_userData (long id, long sel, long view, long tag, long point, long userData) {
 	NSPoint pt = new NSPoint();
 	OS.memmove (pt, point, NSPoint.sizeof);
 	Control control = display.findControl (false);
@@ -2219,9 +2219,9 @@ long /*int*/ view_stringForToolTip_point_userData (long /*int*/ id, long /*int*/
 }
 
 @Override
-void viewWillMoveToWindow(long /*int*/ id, long /*int*/ sel, long /*int*/ newWindow) {
+void viewWillMoveToWindow(long id, long sel, long newWindow) {
 	if (window == null) {
-		long /*int*/ currentWindow = hostWindow != null ? hostWindow.id : 0;
+		long currentWindow = hostWindow != null ? hostWindow.id : 0;
 		if (currentWindow != 0) {
 			removeObserversFromWindow();
 		}
@@ -2232,7 +2232,7 @@ void viewWillMoveToWindow(long /*int*/ id, long /*int*/ sel, long /*int*/ newWin
 }
 
 @Override
-void windowDidBecomeKey(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowDidBecomeKey(long id, long sel, long notification) {
 	if (window != null) {
 		Display display = this.display;
 		display.setMenuBar (menuBar);
@@ -2258,25 +2258,25 @@ void windowDidBecomeKey(long /*int*/ id, long /*int*/ sel, long /*int*/ notifica
 }
 
 @Override
-void windowDidDeminiturize(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowDidDeminiturize(long id, long sel, long notification) {
 	minimized = false;
 	sendEvent(SWT.Deiconify);
 }
 
 @Override
-void windowDidMiniturize(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowDidMiniturize(long id, long sel, long notification) {
 	minimized = true;
 	sendEvent(SWT.Iconify);
 }
 
 @Override
-void windowDidMove(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowDidMove(long id, long sel, long notification) {
 	moved = true;
 	sendEvent(SWT.Move);
 }
 
 @Override
-void windowDidResize(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowDidResize(long id, long sel, long notification) {
 	if (((window.collectionBehavior() & OS.NSWindowCollectionBehaviorFullScreenPrimary) == 0) && fullScreen) {
 		window.setFrame(fullScreenFrame, true);
 		NSRect contentViewFrame = new NSRect();
@@ -2299,7 +2299,7 @@ void windowDidResize(long /*int*/ id, long /*int*/ sel, long /*int*/ notificatio
 }
 
 @Override
-void windowDidResignKey(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowDidResignKey(long id, long sel, long notification) {
 	if (display.isDisposed()) return;
 	sendEvent (SWT.Deactivate);
 	if (isDisposed ()) return;
@@ -2309,9 +2309,9 @@ void windowDidResignKey(long /*int*/ id, long /*int*/ sel, long /*int*/ notifica
 }
 
 @Override
-void windowSendEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void windowSendEvent (long id, long sel, long event) {
 	NSEvent nsEvent = new NSEvent (event);
-	int type = (int)/*64*/nsEvent.type ();
+	int type = (int)nsEvent.type ();
 	switch (type) {
 		case OS.NSLeftMouseDown:
 		case OS.NSRightMouseDown:
@@ -2392,7 +2392,7 @@ void windowSendEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
 				NSString chars = nsEvent.characters();
 
 				if (chars != null && chars.length() == 1) {
-					int firstChar = (int)/*64*/chars.characterAtIndex(0);
+					int firstChar = (int)chars.characterAtIndex(0);
 
 					// Shift-tab appears as control-Y.
 					switch (firstChar) {
@@ -2440,13 +2440,13 @@ private boolean searchForEscMenuItem(Menu menu) {
 }
 
 @Override
-boolean windowShouldClose(long /*int*/ id, long /*int*/ sel, long /*int*/ window) {
+boolean windowShouldClose(long id, long sel, long window) {
 	if (isEnabled()) closeWidget (false);
 	return false;
 }
 
 @Override
-void windowWillClose(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowWillClose(long id, long sel, long notification) {
 	closeWidget(true);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java
index bdfd79199f..e1014978cb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java
@@ -335,7 +335,7 @@ public void removeSelectionListener(SelectionListener listener) {
 @Override
 void sendSelection () {
 	Event event = new Event();
-	int hitPart = (int)/*64*/((NSScroller)view).hitPart();
+	int hitPart = (int)((NSScroller)view).hitPart();
 	int value = getSelection ();
 	switch (hitPart) {
 	    case OS.NSScrollerDecrementLine:
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java
index da70256d26..b5ed9d4f6d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java
@@ -103,13 +103,13 @@ public Spinner (Composite parent, int style) {
 }
 
 @Override
-boolean acceptsFirstResponder(long /*int*/ id, long /*int*/ sel) {
+boolean acceptsFirstResponder(long id, long sel) {
 	if (id == view.id) return false;
 	return super.acceptsFirstResponder (id, sel);
 }
 
 @Override
-boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
+boolean accessibilityIsIgnored(long id, long sel) {
 	if (id == view.id) return true;
 	return super.accessibilityIsIgnored(id, sel);
 }
@@ -217,14 +217,14 @@ protected void checkSubclass () {
 @Override
 public Point computeSize (int wHint, int hHint, boolean changed) {
 	checkWidget ();
-	double /*float*/ width = 0, height = 0;
+	double width = 0, height = 0;
 	String string = Double.toString (buttonView.maxValue ());
 	Font font = Font.cocoa_new(display, textView.font ());
 	NSAttributedString str = parent.createString(string, font, null, 0, false, true, false);
 	NSSize size = str.size ();
 	str.release ();
-	width = (float)/*64*/size.width;
-	height = (float)/*64*/size.height;
+	width = (float)size.width;
+	height = (float)size.height;
 	if (wHint != SWT.DEFAULT) width = wHint;
 	if (hHint != SWT.DEFAULT) height = hHint;
 	Rectangle trim = computeTrim (0, 0, (int)Math.ceil (width), (int)Math.ceil (height));
@@ -244,7 +244,7 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
 	height += frameRect.height - cellRect.height;
 	width += GAP;
 	NSSize size = buttonView.cell ().cellSize ();
-	width += (int)/*64*/size.width;
+	width += (int)size.width;
 	return new Rectangle (x, y, width, height);
 }
 
@@ -348,7 +348,7 @@ void deregister () {
 }
 
 @Override
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rect) {
 	if (backgroundImage == null) return;
 	if (new NSView(id).isKindOfClass(OS.class_NSText)) {
 		NSText text = new NSText(id);
@@ -358,7 +358,7 @@ void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
 }
 
 @Override
-void drawInteriorWithFrame_inView(long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ viewid) {
+void drawInteriorWithFrame_inView(long id, long sel, NSRect cellFrame, long viewid) {
 	Control control = findBackgroundControl();
 	if (control == null) control = this;
 	Image image = control.backgroundImage;
@@ -555,14 +555,14 @@ public int getTextLimit () {
 }
 
 @Override
-boolean handleIsAccessible(long /*int*/ id) {
+boolean handleIsAccessible(long id) {
 	// All subviews of a Spinner can have their accessible properties overridden.
 	// The top-level NSView is already ignored, so we don't need to test for that.
 	return true;
 }
 
 @Override
-boolean isEventView (long /*int*/ id) {
+boolean isEventView (long id) {
 	return true;
 }
 
@@ -812,7 +812,7 @@ void setFont(NSFont font) {
 }
 
 @Override
-void setForeground (double /*float*/ [] color) {
+void setForeground (double [] color) {
 	NSColor nsColor;
 	if (color == null) {
 		nsColor = NSColor.textColor ();
@@ -953,7 +953,7 @@ void setSelection (int value, boolean setPos, boolean setText, boolean notify) {
 		}
 		NSCell cell = new NSCell(textView.cell());
 		if (hooks (SWT.Verify) || filters (SWT.Verify)) {
-			int length = (int)/*64*/cell.title().length();
+			int length = (int)cell.title().length();
 			string = verifyText (string, 0, length, null);
 			if (string == null) return;
 		}
@@ -1041,16 +1041,16 @@ public void setValues (int selection, int minimum, int maximum, int digits, int
 }
 
 @Override
-boolean shouldChangeTextInRange_replacementString(long /*int*/ id, long /*int*/ sel, long /*int*/ affectedCharRange, long /*int*/ replacementString) {
+boolean shouldChangeTextInRange_replacementString(long id, long sel, long affectedCharRange, long replacementString) {
 	NSRange range = new NSRange();
 	OS.memmove(range, affectedCharRange, NSRange.sizeof);
 	boolean result = callSuperBoolean(id, sel, range, replacementString);
 	if (hooks (SWT.Verify)) {
 		String text = new NSString(replacementString).getString();
 		NSEvent currentEvent = display.application.currentEvent();
-		long /*int*/ type = currentEvent.type();
+		long type = currentEvent.type();
 		if (type != OS.NSKeyDown && type != OS.NSKeyUp) currentEvent = null;
-		String newText = verifyText(text, (int)/*64*/range.location, (int)/*64*/(range.location+range.length), currentEvent);
+		String newText = verifyText(text, (int)range.location, (int)(range.location+range.length), currentEvent);
 		if (newText == null) return false;
 		if (text != newText) {
 			int length = newText.length();
@@ -1058,9 +1058,9 @@ boolean shouldChangeTextInRange_replacementString(long /*int*/ id, long /*int*/
 			if (fieldEditor != null) {
 				NSRange selectedRange = fieldEditor.selectedRange();
 				if (textLimit != LIMIT) {
-					long /*int*/ charCount = fieldEditor.string().length();
+					long charCount = fieldEditor.string().length();
 					if (charCount - selectedRange.length + length > textLimit) {
-						length = (int)/*64*/(textLimit - charCount + selectedRange.length);
+						length = (int)(textLimit - charCount + selectedRange.length);
 					}
 				}
 				char [] buffer = new char [length];
@@ -1076,7 +1076,7 @@ boolean shouldChangeTextInRange_replacementString(long /*int*/ id, long /*int*/
 }
 
 @Override
-void textDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void textDidChange (long id, long sel, long aNotification) {
 	super.textDidChange (id, sel, aNotification);
 	boolean [] parseFail = new boolean [1];
 	int value = getSelectionText (parseFail);
@@ -1090,7 +1090,7 @@ void textDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotificatio
 }
 
 @Override
-NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange (long /*int*/ id, long /*int*/ sel, long /*int*/ aTextView, long /*int*/ oldSelectedCharRange, long /*int*/ newSelectedCharRange) {
+NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange (long id, long sel, long aTextView, long oldSelectedCharRange, long newSelectedCharRange) {
 	/* allow the selection change to proceed */
 	NSRange result = new NSRange ();
 	OS.memmove(result, newSelectedCharRange, NSRange.sizeof);
@@ -1098,7 +1098,7 @@ NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange (long /*
 }
 
 @Override
-void textDidEndEditing(long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void textDidEndEditing(long id, long sel, long aNotification) {
 	boolean [] parseFail = new boolean [1];
 	int value = getSelectionText (parseFail);
 	if (parseFail [0]) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java
index bae9669c09..469188bb84 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java
@@ -221,7 +221,7 @@ void destroyItem (TabItem item) {
 }
 
 @Override
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rect) {
 	if (id != view.id) return;
 	fillBackground (view, context, rect, -1);
 }
@@ -522,7 +522,7 @@ void setFont (NSFont font) {
 }
 
 @Override
-void setForeground (double /*float*/ [] color) {
+void setForeground (double [] color) {
 	super.setForeground(color);
 	int index = getSelectionIndex();
 	for (int i = 0; i < itemCount; i++) {
@@ -655,7 +655,7 @@ boolean traversePage (boolean next) {
 }
 
 @Override
-void tabView_willSelectTabViewItem(long /*int*/ id, long /*int*/ sel, long /*int*/ tabView, long /*int*/ tabViewItem) {
+void tabView_willSelectTabViewItem(long id, long sel, long tabView, long tabViewItem) {
 	if (tabViewItem == 0) return;
 	for (int i = 0; i < itemCount; i++) {
 		TabItem item = items [i];
@@ -682,7 +682,7 @@ void tabView_willSelectTabViewItem(long /*int*/ id, long /*int*/ sel, long /*int
 }
 
 @Override
-void tabView_didSelectTabViewItem(long /*int*/ id, long /*int*/ sel, long /*int*/ tabView, long /*int*/ tabViewItem) {
+void tabView_didSelectTabViewItem(long id, long sel, long tabView, long tabViewItem) {
 	if (tabViewItem == 0) return;
 	for (int i = 0; i < itemCount; i++) {
 		TabItem item = items [i];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java
index eec9f4a077..9e6672339e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java
@@ -118,7 +118,7 @@ public TabItem (TabFolder parent, int style, int index) {
 }
 
 @Override
-long /*int*/ accessibilityAttributeValue (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+long accessibilityAttributeValue (long id, long sel, long arg0) {
 
 	if (id == nsItem.id) {
 		NSString nsAttributeName = new NSString(arg0);
@@ -155,7 +155,7 @@ void destroyWidget () {
 }
 
 @Override
-void drawLabelInRect(long /*int*/ id, long /*int*/ sel, boolean shouldTruncateLabel, NSRect rect) {
+void drawLabelInRect(long id, long sel, boolean shouldTruncateLabel, NSRect rect) {
 	if (image != null && !image.isDisposed()) {
 		NSSize imageSize = image.handle.size();
 		NSRect destRect = new NSRect();
@@ -196,8 +196,8 @@ public Rectangle getBounds() {
 	checkWidget();
 	Rectangle result = new Rectangle (0, 0, 0, 0);
 	if (nsItem.respondsToSelector (OS.sel_accessibilityAttributeValue_)) {
-		long /*int*/ posValue = OS.objc_msgSend (nsItem.id, OS.sel_accessibilityAttributeValue_, OS.NSAccessibilityPositionAttribute ());
-		long /*int*/ sizeValue = OS.objc_msgSend (nsItem.id, OS.sel_accessibilityAttributeValue_, OS.NSAccessibilitySizeAttribute ());
+		long posValue = OS.objc_msgSend (nsItem.id, OS.sel_accessibilityAttributeValue_, OS.NSAccessibilityPositionAttribute ());
+		long sizeValue = OS.objc_msgSend (nsItem.id, OS.sel_accessibilityAttributeValue_, OS.NSAccessibilitySizeAttribute ());
 		NSValue val = new NSValue (posValue);
 		NSPoint pt = val.pointValue ();
 		NSWindow window = parent.view.window ();
@@ -436,7 +436,7 @@ public void setToolTipText (String string) {
 }
 
 @Override
-NSSize sizeOfLabel(long /*int*/ id, long /*int*/ sel, boolean shouldTruncateLabel) {
+NSSize sizeOfLabel(long id, long sel, boolean shouldTruncateLabel) {
 	NSSize size = super.sizeOfLabel(id, sel, shouldTruncateLabel);
 	if (image != null && !image.isDisposed()) {
 		NSSize imageSize = image.handle.size();
@@ -463,7 +463,7 @@ void updateText (boolean selected) {
 	if (attriStr != null) {
 		attriStr.release();
 	}
-	double /*float*/ [] foreground = parent.foreground;
+	double [] foreground = parent.foreground;
 	if (foreground == null) {
 		if (selected && OS.VERSION >= 0x1070) {
 			foreground = display.getNSColorRGB(NSColor.alternateSelectedControlTextColor());
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java
index f46680e0b8..c4fea6f523 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java
@@ -80,7 +80,7 @@ public class Table extends Composite {
 	int columnCount, itemCount, lastIndexOf, sortDirection, selectedRowIndex = -1;
 	boolean ignoreSelect, fixScrollWidth, drawExpansion, didSelect, preventSelect, dragDetected;
 	Rectangle imageBounds;
-	double /*float*/ [] headerBackground, headerForeground;
+	double [] headerBackground, headerForeground;
 
 	/* Used to control drop feedback when FEEDBACK_SCROLL is set/not set */
 	boolean shouldScroll = true;
@@ -131,20 +131,20 @@ public Table (Composite parent, int style) {
 }
 
 @Override
-boolean acceptsFirstResponder (long /*int*/ id, long /*int*/ sel) {
+boolean acceptsFirstResponder (long id, long sel) {
 	return true;
 }
 
 @Override
-long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
-	long /*int*/ returnValue = 0;
+long accessibilityAttributeValue(long id, long sel, long arg0) {
+	long returnValue = 0;
 	NSString attributeName = new NSString(arg0);
 
 	// If the check column is visible, don't report it back as a column for accessibility purposes.
 	// The check column is meant to appear as a part of the first column.
 	if (attributeName.isEqualToString (OS.NSAccessibilityColumnsAttribute) || attributeName.isEqualToString(OS.NSAccessibilityVisibleColumnsAttribute)) {
 		if ((style & SWT.CHECK) != 0) {
-			long /*int*/ superValue = super.accessibilityAttributeValue(id, sel, arg0);
+			long superValue = super.accessibilityAttributeValue(id, sel, arg0);
 			if (superValue != 0) {
 				NSArray columns = new NSArray(superValue);
 				NSMutableArray columnsWithoutCheck = NSMutableArray.arrayWithCapacity(columns.count() - 1);
@@ -221,18 +221,18 @@ int calculateWidth (TableItem[] items, int index, GC gc) {
 }
 
 @Override
-NSSize cellSize (long /*int*/ id, long /*int*/ sel) {
+NSSize cellSize (long id, long sel) {
 	NSSize size = super.cellSize(id, sel);
 	NSCell cell = new NSCell(id);
 	NSImage image = cell.image();
 	if (image != null) size.width += imageBounds.width + IMAGE_GAP;
 	if (hooks(SWT.MeasureItem)) {
-		long /*int*/ [] outValue = new long /*int*/ [1];
+		long [] outValue = new long [1];
 		OS.object_getInstanceVariable(id, Display.SWT_ROW, outValue);
-		long /*int*/ rowIndex = outValue [0];
-		TableItem item = _getItem((int)/*64*/rowIndex);
+		long rowIndex = outValue [0];
+		TableItem item = _getItem((int)rowIndex);
 		OS.object_getInstanceVariable(id, Display.SWT_COLUMN, outValue);
-		long /*int*/ tableColumn = outValue[0];
+		long tableColumn = outValue[0];
 		int columnIndex = 0;
 		for (int i=0; i<columnCount; i++) {
 			if (columns [i].nsColumn.id == tableColumn) {
@@ -246,13 +246,13 @@ NSSize cellSize (long /*int*/ id, long /*int*/ sel) {
 }
 
 @Override
-boolean canDragRowsWithIndexes_atPoint(long /*int*/ id, long /*int*/ sel, long /*int*/ rowIndexes, NSPoint mouseDownPoint) {
+boolean canDragRowsWithIndexes_atPoint(long id, long sel, long rowIndexes, NSPoint mouseDownPoint) {
 	if (!super.canDragRowsWithIndexes_atPoint(id, sel, rowIndexes, mouseDownPoint)) return false;
 
 	// If the current row is not selected and the user is not attempting to modify the selection, select the row first.
 	NSTableView widget = (NSTableView)view;
-	long /*int*/ row = widget.rowAtPoint(mouseDownPoint);
-	long /*int*/ modifiers = NSApplication.sharedApplication().currentEvent().modifierFlags();
+	long row = widget.rowAtPoint(mouseDownPoint);
+	long modifiers = NSApplication.sharedApplication().currentEvent().modifierFlags();
 
 	boolean drag = (state & DRAG_DETECT) != 0 && hooks (SWT.DragDetect);
 	if (drag) {
@@ -453,7 +453,7 @@ void clearCachedWidth (TableItem[] items) {
 }
 
 @Override
-long /*int*/ columnAtPoint(long /*int*/ id, long /*int*/ sel, NSPoint point) {
+long columnAtPoint(long id, long sel, NSPoint point) {
 	if ((style & SWT.CHECK) != 0) {
 		if (point.x <= getCheckColumnWidth() && point.y < headerView.frame().height) return 1;
 	}
@@ -567,7 +567,7 @@ void createHandle () {
 		widget.addTableColumn (checkColumn);
 		checkColumn.setResizingMask(OS.NSTableColumnNoResizing);
 		checkColumn.setEditable(false);
-		long /*int*/ cls = NSButton.cellClass (); /* use our custom cell class */
+		long cls = NSButton.cellClass (); /* use our custom cell class */
 		buttonCell = new NSButtonCell (OS.class_createInstance (cls, 0));
 		buttonCell.init ();
 		checkColumn.setDataCell (buttonCell);
@@ -694,7 +694,7 @@ void deregister () {
 }
 
 @Override
-void deselectAll(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
+void deselectAll(long id, long sel, long sender) {
 	if (preventSelect && !ignoreSelect) return;
 	if ((style & SWT.SINGLE) != 0 && !ignoreSelect) {
 		if ( ((NSTableView)view).selectedRow() != -1) return;
@@ -703,7 +703,7 @@ void deselectAll(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
 }
 
 @Override
-void deselectRow (long /*int*/ id, long /*int*/ sel, long /*int*/ index) {
+void deselectRow (long id, long sel, long index) {
 	if (preventSelect && !ignoreSelect) return;
 	if ((style & SWT.SINGLE) != 0 && !ignoreSelect) {
 		if ( ((NSTableView)view).selectedRow() == index) return;
@@ -896,9 +896,9 @@ void destroyItem (TableColumn column) {
 	}
 
 	NSArray array = ((NSTableView)view).tableColumns ();
-	int arraySize = (int)/*64*/array.count ();
+	int arraySize = (int)array.count ();
 	for (int i = oldIndex; i < arraySize; i++) {
-		long /*int*/ columnId = array.objectAtIndex (i).id;
+		long columnId = array.objectAtIndex (i).id;
 		for (int j = 0; j < columnCount; j++) {
 			if (columns[j].nsColumn.id == columnId) {
 				columns [j].sendEvent (SWT.Move);
@@ -928,14 +928,14 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) {
 }
 
 @Override
-void drawBackgroundInClipRect(long /*int*/ id, long /*int*/ sel, NSRect rect) {
+void drawBackgroundInClipRect(long id, long sel, NSRect rect) {
 	super.drawViewBackgroundInRect(id, sel, rect);
 	if (id != view.id) return;
 	fillBackground (view, NSGraphicsContext.currentContext(), rect, -1);
 }
 
 @Override
-void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect rect, long /*int*/ view) {
+void drawInteriorWithFrame_inView (long id, long sel, NSRect rect, long view) {
 	boolean hooksErase = hooks (SWT.EraseItem);
 	boolean hooksPaint = hooks (SWT.PaintItem);
 	boolean hooksMeasure = hooks (SWT.MeasureItem);
@@ -943,13 +943,13 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect rec
 	NSTextFieldCell cell = new NSTextFieldCell (id);
 
 	NSTableView widget = (NSTableView)this.view;
-	long /*int*/ [] outValue = new long /*int*/ [1];
+	long [] outValue = new long [1];
 	OS.object_getInstanceVariable(id, Display.SWT_ROW, outValue);
-	long /*int*/ rowIndex = outValue [0];
-	TableItem item = _getItem((int)/*64*/rowIndex);
+	long rowIndex = outValue [0];
+	TableItem item = _getItem((int)rowIndex);
 	OS.object_getInstanceVariable(id, Display.SWT_COLUMN, outValue);
-	long /*int*/ tableColumn = outValue[0];
-	long /*int*/ nsColumnIndex = widget.tableColumns().indexOfObjectIdenticalTo(new id(tableColumn));
+	long tableColumn = outValue[0];
+	long nsColumnIndex = widget.tableColumns().indexOfObjectIdenticalTo(new id(tableColumn));
 	int columnIndex = 0;
 	for (int i=0; i<columnCount; i++) {
 		if (columns [i].nsColumn.id == tableColumn) {
@@ -986,7 +986,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect rec
 		NSRect rowRect = widget.rectOfRow (rowIndex);
 		cellRect.width = rowRect.width;
 	}
-	double /*float*/ offsetX = 0, offsetY = 0;
+	double offsetX = 0, offsetY = 0;
 	if (hooksPaint || hooksErase) {
 		NSRect frameCell = widget.frameOfCellAtColumn(nsColumnIndex, rowIndex);
 		offsetX = rect.x - frameCell.x;
@@ -1067,7 +1067,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect rec
 
 	if (drawBackground && !drawSelection) {
 		context.saveGraphicsState ();
-		double /*float*/ [] colorRGB = background.handle;
+		double [] colorRGB = background.handle;
 		NSColor color = NSColor.colorWithDeviceRed (colorRGB[0], colorRGB[1], colorRGB[2], 1f);
 		color.setFill ();
 		NSBezierPath.fillRect (cellRect);
@@ -1101,7 +1101,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect rec
 			* foreground color to black when the cell is highlighted. The text
 			* still draws white.  The fix is to draw the text and not call super.
 			*/
-			double /*float*/ [] color = userForeground.handle;
+			double [] color = userForeground.handle;
 			if (color[0] == 0 && color[1] == 0 && color[2] == 0 && color[3] == 1) {
 				NSMutableAttributedString newStr = new NSMutableAttributedString(cell.attributedStringValue().mutableCopy());
 				NSRange range = new NSRange();
@@ -1185,14 +1185,14 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect rec
 }
 
 @Override
-void drawWithExpansionFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ view) {
+void drawWithExpansionFrame_inView (long id, long sel, NSRect cellFrame, long view) {
 	drawExpansion = true;
 	super.drawWithExpansionFrame_inView(id, sel, cellFrame, view);
 	drawExpansion = false;
 }
 
 @Override
-void drawRect(long /*int*/ id, long /*int*/ sel, NSRect rect) {
+void drawRect(long id, long sel, NSRect rect) {
 	fixScrollWidth = false;
 	super.drawRect(id, sel, rect);
 	if (isDisposed ()) return;
@@ -1203,7 +1203,7 @@ void drawRect(long /*int*/ id, long /*int*/ sel, NSRect rect) {
 }
 
 @Override
-NSRect expansionFrameWithFrame_inView(long /*int*/ id, long /*int*/ sel, NSRect cellRect, long /*int*/ view) {
+NSRect expansionFrameWithFrame_inView(long id, long sel, NSRect cellRect, long view) {
 	if (toolTipText == null) {
 		NSRect rect = super.expansionFrameWithFrame_inView(id, sel, cellRect, view);
 		NSCell cell = new NSCell(id);
@@ -1252,7 +1252,7 @@ Widget findTooltip (NSPoint pt) {
 	NSTableHeaderView headerView = widget.headerView();
 	if (headerView != null) {
 		pt = headerView.convertPoint_fromView_ (pt, null);
-		long /*int*/ index = headerView.columnAtPoint (pt);
+		long index = headerView.columnAtPoint (pt);
 		if (index != -1) {
 			NSArray nsColumns = widget.tableColumns ();
 			id nsColumn = nsColumns.objectAtIndex (index);
@@ -1595,7 +1595,7 @@ public TableItem getItem (Point point) {
 	NSPoint pt = new NSPoint();
 	pt.x = point.x;
 	pt.y = point.y;
-	int row = (int)/*64*/widget.rowAtPoint(pt);
+	int row = (int)widget.rowAtPoint(pt);
 	if (row == -1) return null;
 	return items[row];
 }
@@ -1706,12 +1706,12 @@ public TableItem [] getSelection () {
 		return new TableItem [0];
 	}
 	NSIndexSet selection = widget.selectedRowIndexes();
-	int count = (int)/*64*/selection.count();
-	long /*int*/ [] indexBuffer = new long /*int*/ [count];
+	int count = (int)selection.count();
+	long [] indexBuffer = new long [count];
 	selection.getIndexes(indexBuffer, count, 0);
 	TableItem [] result = new TableItem  [count];
 	for (int i=0; i<count; i++) {
-		result [i] = _getItem ((int)/*64*/indexBuffer [i]);
+		result [i] = _getItem ((int)indexBuffer [i]);
 	}
 	return result;
 }
@@ -1728,7 +1728,7 @@ public TableItem [] getSelection () {
  */
 public int getSelectionCount () {
 	checkWidget ();
-	return (int)/*64*/((NSTableView)view).numberOfSelectedRows();
+	return (int)((NSTableView)view).numberOfSelectedRows();
 }
 
 /**
@@ -1749,10 +1749,10 @@ public int getSelectionIndex () {
 		return -1;
 	}
 	NSIndexSet selection = widget.selectedRowIndexes();
-	int count = (int)/*64*/selection.count();
-	long /*int*/ [] result = new long /*int*/ [count];
+	int count = (int)selection.count();
+	long [] result = new long [count];
 	selection.getIndexes(result, count, 0);
-	return (int)/*64*/result [0];
+	return (int)result [0];
 }
 
 /**
@@ -1778,12 +1778,12 @@ public int [] getSelectionIndices () {
 		return new int [0];
 	}
 	NSIndexSet selection = widget.selectedRowIndexes();
-	int count = (int)/*64*/selection.count();
-	long /*int*/ [] indices = new long /*int*/ [count];
+	int count = (int)selection.count();
+	long [] indices = new long [count];
 	selection.getIndexes(indices, count, 0);
 	int [] result = new int [count];
 	for (int i = 0; i < indices.length; i++) {
-		result [i] = (int)/*64*/indices [i];
+		result [i] = (int)indices [i];
 	}
 	return result;
 }
@@ -1861,13 +1861,13 @@ public int getTopIndex () {
 			point.y += height;
 		}
 	}
-	int /*64*/ rowAtPoint = (int)/*64*/((NSTableView)view).rowAtPoint(point);
+	int /*64*/ rowAtPoint = (int)((NSTableView)view).rowAtPoint(point);
 	if (rowAtPoint == -1) return 0; /* Empty table */
 	return rowAtPoint;
 }
 
 @Override
-NSRect headerRectOfColumn (long /*int*/ id, long /*int*/ sel, long /*int*/ column) {
+NSRect headerRectOfColumn (long id, long sel, long column) {
 	if ((style & SWT.CHECK) == 0) return callSuperRect(id, sel, column);
 
 	if (column == 0) {
@@ -1886,7 +1886,7 @@ NSRect headerRectOfColumn (long /*int*/ id, long /*int*/ sel, long /*int*/ colum
 }
 
 @Override
-void highlightSelectionInClipRect(long /*int*/ id, long /*int*/ sel, long /*int*/ rect) {
+void highlightSelectionInClipRect(long id, long sel, long rect) {
 	if (hooks (SWT.EraseItem)) return;
 	if ((style & SWT.HIDE_SELECTION) != 0 && !hasFocus()) return;
 	NSRect clipRect = new NSRect ();
@@ -1895,7 +1895,7 @@ void highlightSelectionInClipRect(long /*int*/ id, long /*int*/ sel, long /*int*
 }
 
 @Override
-long /*int*/ hitTestForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event, NSRect rect, long /*int*/ controlView) {
+long hitTestForEvent (long id, long sel, long event, NSRect rect, long controlView) {
 	/*
 	* For some reason, the cell class needs to implement hitTestForEvent:inRect:ofView:,
 	* otherwise the double action selector is not called properly.
@@ -1904,14 +1904,14 @@ long /*int*/ hitTestForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ ev
 }
 
 @Override
-long /*int*/ image (long /*int*/ id, long /*int*/ sel) {
-	long /*int*/ [] image = new long /*int*/ [1];
+long image (long id, long sel) {
+	long [] image = new long [1];
 	OS.object_getInstanceVariable(id, Display.SWT_IMAGE, image);
 	return image[0];
 }
 
 @Override
-NSRect imageRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
+NSRect imageRectForBounds (long id, long sel, NSRect cellFrame) {
 	NSImage image = new NSCell(id).image();
 	if (image != null) {
 		cellFrame.x += IMAGE_GAP;
@@ -1922,7 +1922,7 @@ NSRect imageRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame)
 }
 
 int indexOf (NSTableColumn column) {
-	return (int)/*64*/((NSTableView)view).tableColumns().indexOfObjectIdenticalTo(column);
+	return (int)((NSTableView)view).tableColumns().indexOfObjectIdenticalTo(column);
 }
 
 /**
@@ -2013,7 +2013,7 @@ boolean isTransparent() {
 }
 
 @Override
-void keyDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void keyDown(long id, long sel, long theEvent) {
 	ignoreSelect = preventSelect = false;
 	super.keyDown(id, sel, theEvent);
 }
@@ -2025,7 +2025,7 @@ boolean isTrim (NSView view) {
 }
 
 @Override
-long /*int*/ menuForEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+long menuForEvent(long id, long sel, long theEvent) {
 	if (display.lastHandledMenuForEventId == theEvent) return 0;
 	if (id != headerView.id) {
 		/*
@@ -2041,7 +2041,7 @@ long /*int*/ menuForEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ theEve
 
 		// select the row that was clicked before showing the menu for the event
 		NSPoint mousePoint = view.convertPoint_fromView_(event.locationInWindow(), null);
-		long /*int*/ row = table.rowAtPoint(mousePoint);
+		long row = table.rowAtPoint(mousePoint);
 
 		// figure out if the row that was just clicked on is currently selected
 		if (selectedRowIndexes.containsIndex(row) == false) {
@@ -2056,7 +2056,7 @@ long /*int*/ menuForEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ theEve
 }
 
 @Override
-void mouseDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDown (long id, long sel, long theEvent) {
 	if (id == view.id) {
 		// Bug/feature in Cocoa:  If the table has a context menu we just set it visible instead of returning
 		// it from menuForEvent:.  This has the side effect, however, of sending control-click to the NSTableView,
@@ -2069,15 +2069,15 @@ void mouseDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-void mouseDownSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDownSuper(long id, long sel, long theEvent) {
 	ignoreSelect = preventSelect = false;
 	boolean check = false;
 	NSEvent nsEvent = new NSEvent(theEvent);
 	NSTableView widget = (NSTableView)view;
 	NSPoint pt = view.convertPoint_fromView_(nsEvent.locationInWindow(), null);
-	int row = (int)/*64*/widget.rowAtPoint(pt);
+	int row = (int)widget.rowAtPoint(pt);
 	if (row != -1 && (style & SWT.CHECK) != 0) {
-		int column = (int)/*64*/widget.columnAtPoint(pt);
+		int column = (int)widget.columnAtPoint(pt);
 		NSCell cell = widget.preparedCellAtColumn(column, row);
 		if (cell != null && cell.isKindOfClass(OS.class_NSButtonCell) && cell.isEnabled()) {
 			NSRect checkRect = cell.imageRectForBounds(widget.frameOfCellAtColumn(column, row));
@@ -2099,7 +2099,7 @@ void mouseDownSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-boolean needsPanelToBecomeKey (long /*int*/ id, long /*int*/ sel) {
+boolean needsPanelToBecomeKey (long id, long sel) {
 	return false;
 }
 
@@ -2110,10 +2110,10 @@ boolean needsPanelToBecomeKey (long /*int*/ id, long /*int*/ sel) {
  * override [NSCell nextState] to go directly to the desired state.
  */
 @Override
-long /*int*/ nextState (long /*int*/ id, long /*int*/ sel) {
+long nextState (long id, long sel) {
 	NSTableView tableView = (NSTableView)view;
-	int index = (int)/*64*/tableView.clickedRow();
-	if (index == -1) index = (int)/*64*/tableView.selectedRow ();
+	int index = (int)tableView.clickedRow();
+	if (index == -1) index = (int)tableView.selectedRow ();
 	TableItem item = items[index];
 	if (item.grayed) {
 		return item.checked ? OS.NSOffState : OS.NSMixedState;
@@ -2122,7 +2122,7 @@ long /*int*/ nextState (long /*int*/ id, long /*int*/ sel) {
 }
 
 @Override
-long /*int*/ numberOfRowsInTableView(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView) {
+long numberOfRowsInTableView(long id, long sel, long aTableView) {
 	return itemCount;
 }
 
@@ -2374,7 +2374,7 @@ void reskinChildren (int flags) {
 }
 
 @Override
-void scrollClipViewToPoint(long /*int*/ id, long /*int*/ sel, long /*int*/ clipView, NSPoint point) {
+void scrollClipViewToPoint(long id, long sel, long clipView, NSPoint point) {
 	if (shouldScroll) {
 		super.scrollClipViewToPoint(id, sel, clipView, point);
 		if ((style & SWT.CHECK) != 0 && columnCount > 0 && ((NSTableView)view).headerView() != null) {
@@ -2645,7 +2645,7 @@ public void setHeaderBackground (Color color) {
 	if (color != null) {
 		if (color.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	}
-	double /*float*/ [] headerBackground = color != null ? color.handle : null;
+	double [] headerBackground = color != null ? color.handle : null;
 	if (equals (headerBackground, this.headerBackground)) return;
 	this.headerBackground = headerBackground;
 	if (getHeaderVisible()) {
@@ -2677,7 +2677,7 @@ public void setHeaderForeground (Color color) {
 	if (color != null) {
 		if (color.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	}
-	double /*float*/ [] headerForeground = color != null ? color.handle : null;
+	double [] headerForeground = color != null ? color.handle : null;
 	if (equals (headerForeground, this.headerForeground)) return;
 	this.headerForeground = headerForeground;
 	if (getHeaderVisible()) {
@@ -2708,7 +2708,7 @@ public void setHeaderVisible (boolean show) {
 }
 
 @Override
-void setImage (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void setImage (long id, long sel, long arg0) {
 	OS.object_setInstanceVariable(id, Display.SWT_IMAGE, arg0);
 }
 
@@ -2766,8 +2766,8 @@ public void setItemCount (int count) {
 
 void setItemHeight (Image image, NSFont font, boolean set) {
 	if (font == null) font = getFont ().handle;
-	double /*float*/ ascent = font.ascender ();
-	double /*float*/ descent = -font.descender () + font.leading ();
+	double ascent = font.ascender ();
+	double descent = -font.descender () + font.leading ();
 	int height = (int)Math.ceil (ascent + descent) + 1;
 	Rectangle bounds = image != null ? image.getBounds () : imageBounds;
 	if (bounds != null) {
@@ -3036,7 +3036,7 @@ public void setSelection (TableItem [] items) {
 }
 
 @Override
-void setShouldScrollClipView(long /*int*/ id, long /*int*/ sel, boolean shouldScroll) {
+void setShouldScrollClipView(long id, long sel, boolean shouldScroll) {
 	this.shouldScroll = shouldScroll;
 }
 
@@ -3223,7 +3223,7 @@ public void showSelection () {
 }
 
 @Override
-void selectRowIndexes_byExtendingSelection (long /*int*/ id, long /*int*/ sel, long /*int*/ indexes, boolean extend) {
+void selectRowIndexes_byExtendingSelection (long id, long sel, long indexes, boolean extend) {
 	if (preventSelect && !ignoreSelect) return;
 	if ((style & SWT.SINGLE) != 0 && !ignoreSelect) {
 		NSIndexSet set = new NSIndexSet(indexes);
@@ -3235,12 +3235,12 @@ void selectRowIndexes_byExtendingSelection (long /*int*/ id, long /*int*/ sel, l
 @Override
 void sendDoubleSelection() {
 	NSTableView tableView = (NSTableView)view;
-	int rowIndex = (int)/*64*/tableView.clickedRow ();
-	if (rowIndex == -1) rowIndex = (int)/*64*/tableView.selectedRow();
+	int rowIndex = (int)tableView.clickedRow ();
+	if (rowIndex == -1) rowIndex = (int)tableView.selectedRow();
 	if (rowIndex != -1) {
 		if ((style & SWT.CHECK) != 0) {
 			NSArray columns = tableView.tableColumns ();
-			int columnIndex = (int)/*64*/tableView.clickedColumn ();
+			int columnIndex = (int)tableView.clickedColumn ();
 			if (columnIndex != -1) {
 				id column = columns.objectAtIndex (columnIndex);
 				if (column.id == checkColumn.id) return;
@@ -3304,7 +3304,7 @@ void sendMeasureItem (TableItem item, int columnIndex, NSSize size, boolean isSe
 }
 
 @Override
-void tableViewColumnDidMove (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void tableViewColumnDidMove (long id, long sel, long aNotification) {
 	NSNotification notification = new NSNotification (aNotification);
 	NSDictionary userInfo = notification.userInfo ();
 	NSString nsstring = (NSString) new NSString().alloc();
@@ -3333,7 +3333,7 @@ void tableViewColumnDidMove (long /*int*/ id, long /*int*/ sel, long /*int*/ aNo
 }
 
 @Override
-void tableViewColumnDidResize (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void tableViewColumnDidResize (long id, long sel, long aNotification) {
 	NSNotification notification = new NSNotification (aNotification);
 	NSDictionary userInfo = notification.userInfo ();
 	NSString nsstring = (NSString) new NSString().alloc();
@@ -3351,7 +3351,7 @@ void tableViewColumnDidResize (long /*int*/ id, long /*int*/ sel, long /*int*/ a
 	if (index == -1) return; /* column was disposed in Resize callback */
 
 	NSArray nsColumns = tableView.tableColumns ();
-	int columnCount = (int)/*64*/tableView.numberOfColumns ();
+	int columnCount = (int)tableView.numberOfColumns ();
 	for (int i = index + 1; i < columnCount; i++) {
 		columnId = nsColumns.objectAtIndex (i);
 		column = getColumn (columnId);
@@ -3366,7 +3366,7 @@ void tableViewColumnDidResize (long /*int*/ id, long /*int*/ sel, long /*int*/ a
 void sendSelection () {
 	if (ignoreSelect) return;
 	NSTableView widget = (NSTableView) view;
-	int row = (int)/*64*/widget.selectedRow ();
+	int row = (int)widget.selectedRow ();
 	if(row == -1)
 		sendSelectionEvent (SWT.Selection);
 	else {
@@ -3379,27 +3379,27 @@ void sendSelection () {
 }
 
 @Override
-void tableViewSelectionDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void tableViewSelectionDidChange (long id, long sel, long aNotification) {
 	if (didSelect) return;
 	sendSelection();
 }
 
 @Override
-void tableViewSelectionIsChanging (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void tableViewSelectionIsChanging (long id, long sel, long aNotification) {
 	didSelect = true;
 	sendSelection();
 }
 
 @Override
-void tableView_didClickTableColumn (long /*int*/ id, long /*int*/ sel, long /*int*/ tableView, long /*int*/ tableColumn) {
+void tableView_didClickTableColumn (long id, long sel, long tableView, long tableColumn) {
 	TableColumn column = getColumn (new id (tableColumn));
 	if (column == null) return; /* either CHECK column or firstColumn in 0-column Table */
 	column.sendSelectionEvent (SWT.Selection);
 }
 
 @Override
-long /*int*/ tableView_objectValueForTableColumn_row (long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
-	int index = (int)/*64*/rowIndex;
+long tableView_objectValueForTableColumn_row (long id, long sel, long aTableView, long aTableColumn, long rowIndex) {
+	int index = (int)rowIndex;
 	TableItem item = _getItem (index);
 	checkData (item, index);
 	if (checkColumn != null && aTableColumn == checkColumn.id) {
@@ -3420,7 +3420,7 @@ long /*int*/ tableView_objectValueForTableColumn_row (long /*int*/ id, long /*in
 }
 
 @Override
-boolean tableView_shouldReorderColumn_toColumn(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ currentColIndex, long /*int*/ newColIndex) {
+boolean tableView_shouldReorderColumn_toColumn(long id, long sel, long aTableView, long currentColIndex, long newColIndex) {
 	// Check column should never move and no column can be dragged to the left of it, if present.
 	if ((style & SWT.CHECK) != 0) {
 		if (currentColIndex == 0) return false;
@@ -3439,7 +3439,7 @@ boolean tableView_shouldReorderColumn_toColumn(long /*int*/ id, long /*int*/ sel
 }
 
 @Override
-boolean tableView_shouldTrackCell_forTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ table, long /*int*/ cell, /*long*/ long /*int*/ tableColumn, long /*int*/ rowIndex) {
+boolean tableView_shouldTrackCell_forTableColumn_row(long id, long sel, long table, long cell, /*long*/ long tableColumn, long rowIndex) {
 	if ((style & SWT.CHECK) != 0) {
 		if (new NSCell(cell).isKindOfClass(OS.class_NSButtonCell)) return true;
 	}
@@ -3448,23 +3448,23 @@ boolean tableView_shouldTrackCell_forTableColumn_row(long /*int*/ id, long /*int
 }
 
 @Override
-void tableView_setObjectValue_forTableColumn_row (long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ anObject, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
+void tableView_setObjectValue_forTableColumn_row (long id, long sel, long aTableView, long anObject, long aTableColumn, long rowIndex) {
 	if (checkColumn != null && aTableColumn == checkColumn.id)  {
-		TableItem item = items [(int)/*64*/rowIndex];
+		TableItem item = items [(int)rowIndex];
 		item.checked = !item.checked;
 		Event event = new Event ();
 		event.detail = SWT.CHECK;
 		event.item = item;
-		event.index = (int)/*64*/rowIndex;
+		event.index = (int)rowIndex;
 		sendSelectionEvent (SWT.Selection, event, false);
 		item.redraw (-1);
 	}
 }
 
 @Override
-void tableView_willDisplayCell_forTableColumn_row (long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ cell, long /*int*/ tableColumn, long /*int*/ rowIndex) {
+void tableView_willDisplayCell_forTableColumn_row (long id, long sel, long aTableView, long cell, long tableColumn, long rowIndex) {
 	if (checkColumn != null && tableColumn == checkColumn.id) return;
-	TableItem item = items [(int)/*64*/rowIndex];
+	TableItem item = items [(int)rowIndex];
 	int index = 0;
 	for (int i=0; i<columnCount; i++) {
 		if (columns [i].nsColumn.id == tableColumn) {
@@ -3528,7 +3528,7 @@ void tableView_willDisplayCell_forTableColumn_row (long /*int*/ id, long /*int*/
 }
 
 @Override
-boolean tableView_writeRowsWithIndexes_toPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
+boolean tableView_writeRowsWithIndexes_toPasteboard(long id, long sel, long arg0, long arg1, long arg2) {
 	return sendMouseEvent(NSApplication.sharedApplication().currentEvent(), SWT.DragDetect, true);
 }
 
@@ -3545,8 +3545,8 @@ boolean sendMouseEvent(NSEvent nsEvent, int type, boolean send) {
 		if (!dragDetected && selectedRowIndex != -1) {
 			NSTableView widget = (NSTableView)view;
 			NSIndexSet selectedRows = widget.selectedRowIndexes ();
-			int count = (int)/*64*/selectedRows.count();
-			long /*int*/ [] indexBuffer = new long /*int*/ [count];
+			int count = (int)selectedRows.count();
+			long [] indexBuffer = new long [count];
 			selectedRows.getIndexes(indexBuffer, count, 0);
 			for (int i = 0; i < count; i++) {
 				if (indexBuffer[i] == selectedRowIndex) continue;
@@ -3556,7 +3556,7 @@ boolean sendMouseEvent(NSEvent nsEvent, int type, boolean send) {
 			}
 
 			Event event = new Event ();
-			event.item = _getItem ((int)/*64*/selectedRowIndex);
+			event.item = _getItem ((int)selectedRowIndex);
 			selectedRowIndex = -1;
 			sendSelectionEvent (SWT.Selection, event, false);
 			ignoreSelect = true;
@@ -3568,7 +3568,7 @@ boolean sendMouseEvent(NSEvent nsEvent, int type, boolean send) {
 }
 
 @Override
-NSRect titleRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
+NSRect titleRectForBounds (long id, long sel, NSRect cellFrame) {
 	NSImage image = new NSCell(id).image();
 	if (image != null) {
 		int imageWidth = imageBounds.width + IMAGE_GAP;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java
index 1cc6fc3e49..4f67ed287f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java
@@ -207,7 +207,7 @@ void destroyWidget () {
 }
 
 @Override
-void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellRect, long /*int*/ view) {
+void drawInteriorWithFrame_inView (long id, long sel, NSRect cellRect, long view) {
 	/*
 	 * Feature in Cocoa.  When the last column in a table does not reach the
 	 * rightmost edge of the table view, the cell that draws the rightmost-
@@ -261,7 +261,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cel
 	if (parent.headerBackground != null) {
 		// fill header background
 		context.saveGraphicsState();
-		double /*float*/ [] colorRGB = parent.headerBackground;
+		double [] colorRGB = parent.headerBackground;
 		NSColor color1 = NSColor.colorWithDeviceRed(colorRGB[0], colorRGB[1], colorRGB[2], 1f);
 		color1.setFill();
 		/*
@@ -306,7 +306,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cel
 			NSRect sortIndicatorRect = headerCell.sortIndicatorRectForBounds(cellRect);
 			context.saveGraphicsState();
 			if (parent.headerForeground != null) {
-				double /*float*/ [] colorRGB = parent.headerForeground;
+				double [] colorRGB = parent.headerForeground;
 				NSColor color = NSColor.colorWithDeviceRed(colorRGB[0], colorRGB[1], colorRGB[2], 0.9f);
 				color.setStroke();
 			}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java
index 42be5acb25..3e092ac31b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java
@@ -67,7 +67,7 @@ public class Text extends Scrollable {
 	String message;
 	NSRange selectionRange;
 	id targetSearch, targetCancel;
-	long /*int*/ actionSearch, actionCancel;
+	long actionSearch, actionCancel;
 
 	/**
 	* The maximum number of characters that can be entered
@@ -346,7 +346,7 @@ public void append (String string) {
 }
 
 @Override
-boolean becomeFirstResponder (long /*int*/ id, long /*int*/ sel) {
+boolean becomeFirstResponder (long id, long sel) {
 	receivingFocus = true;
 	boolean result = super.becomeFirstResponder (id, sel);
 	receivingFocus = false;
@@ -594,9 +594,9 @@ void createWidget () {
 	super.createWidget ();
 	if ((style & SWT.PASSWORD) != 0) {
 		NSText fieldEditor = view.window().fieldEditor(true, view);
-		long /*int*/ nsSecureTextViewClass = OS.objc_lookUpClass("NSSecureTextView");
+		long nsSecureTextViewClass = OS.objc_lookUpClass("NSSecureTextView");
 		if (fieldEditor != null && nsSecureTextViewClass != 0 && fieldEditor.isKindOfClass(nsSecureTextViewClass)) {
-			long /*int*/ editorClass = OS.objc_getClass("SWTSecureEditorView");
+			long editorClass = OS.objc_getClass("SWTSecureEditorView");
 			OS.object_setClass(fieldEditor.id, editorClass);
 		}
 	}
@@ -681,7 +681,7 @@ void deregister() {
 }
 
 @Override
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rect) {
 	if ((style & SWT.SINGLE) != 0) {
 		if (backgroundImage == null) return;
 		if (new NSView(id).isKindOfClass(OS.class_NSText)) {
@@ -696,8 +696,8 @@ void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
 		 *  here directly on the NSTextView and return.
 		 */
 		if (backgroundImage == null) {
-			double /*float*/ [] background = this.background;
-			double /*float*/ alpha;
+			double [] background = this.background;
+			double alpha;
 			if (background == null) {
 				background = defaultBackground ().handle;
 				alpha = getThemeAlpha ();
@@ -713,7 +713,7 @@ void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
 }
 
 @Override
-void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ viewid) {
+void drawInteriorWithFrame_inView (long id, long sel, NSRect cellFrame, long viewid) {
 	Control control = findBackgroundControl();
 	if (control == null) control = this;
 	Image image = control.backgroundImage;
@@ -730,7 +730,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cel
 }
 
 
-void drawInteriorWithFrame_inView_searchfield (long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ viewid) {
+void drawInteriorWithFrame_inView_searchfield (long id, long sel, NSRect cellFrame, long viewid) {
 	/*
 	 * Cocoa does not support a background color for the search field. Therefore we
 	 * paint it ourselves, if a background color is set.
@@ -794,7 +794,7 @@ void drawRect(long id, long sel, NSRect rect) {
 boolean dragDetect (int x, int y, boolean filter, boolean [] consume) {
 	Point selection = getSelection ();
 	if (selection.x != selection.y) {
-		long /*int*/ position = getPosition (x, y);
+		long position = getPosition (x, y);
 		if (selection.x <= position && position < selection.y) {
 			if (super.dragDetect (x, y, filter, consume)) {
 				if (consume != null) consume [0] = true;
@@ -840,7 +840,7 @@ public int getCaretLineNumber () {
 }
 
 @Override
-boolean acceptsFirstResponder(long /*int*/ id, long /*int*/ sel) {
+boolean acceptsFirstResponder(long id, long sel) {
 	if ((style & SWT.READ_ONLY) != 0) return true;
 	return super.acceptsFirstResponder(id, sel);
 }
@@ -870,8 +870,8 @@ public Point getCaretLocation () {
 	NSLayoutManager layoutManager = widget.layoutManager();
 	NSTextContainer container = widget.textContainer();
 	NSRange range = widget.selectedRange();
-	long /*int*/ [] rectCount = new long /*int*/ [1];
-	long /*int*/ pArray = layoutManager.rectArrayForCharacterRange(range, range, container, rectCount);
+	long [] rectCount = new long [1];
+	long pArray = layoutManager.rectArrayForCharacterRange(range, range, container, rectCount);
 	NSRect rect = new NSRect();
 	if (rectCount[0] > 0) OS.memmove(rect, pArray, NSRect.sizeof);
 	return new Point((int)rect.x, (int)rect.y);
@@ -893,10 +893,10 @@ public Point getCaretLocation () {
 public int getCaretPosition () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) {
-		return selectionRange != null ? (int)/*64*/selectionRange.location : 0;
+		return selectionRange != null ? (int)selectionRange.location : 0;
 	} else {
 		NSRange range = ((NSTextView)view).selectedRange();
-		return (int)/*64*/range.location;
+		return (int)range.location;
 	}
 }
 
@@ -915,7 +915,7 @@ public int getCharCount () {
 	if ((style & SWT.SINGLE) != 0) {
 		return (int)((NSControl) view).stringValue().length ();
 	} else {
-		return (int)/*64*/((NSTextView) view).textStorage ().length ();
+		return (int)((NSTextView) view).textStorage ().length ();
 	}
 }
 
@@ -989,7 +989,7 @@ char [] getEditText () {
 		str = ((NSTextView)view).textStorage().string();
 	}
 
-	int length = (int)/*64*/str.length ();
+	int length = (int)str.length ();
 	char [] buffer = new char [length];
 	NSRange range = new NSRange ();
 	range.length = length;
@@ -1005,16 +1005,16 @@ char [] getEditText (int start, int end) {
 		str = ((NSTextView)view).textStorage().string();
 	}
 
-	int length = (int)/*64*/str.length ();
+	int length = (int)str.length ();
 	end = Math.min (end, length - 1);
 	if (start > end) return new char [0];
 	start = Math.max (0, start);
 	NSRange range = new NSRange ();
 	range.location = start;
 	range.length = Math.max (0, end - start + 1);
-	char [] buffer = new char [(int)/*64*/range.length];
+	char [] buffer = new char [(int)range.length];
 	if (hiddenText != null) {
-		System.arraycopy (hiddenText, (int)/*64*/range.location, buffer, 0, buffer.length);
+		System.arraycopy (hiddenText, (int)range.location, buffer, 0, buffer.length);
 	} else {
 		str.getCharacters (buffer, range);
 	}
@@ -1025,7 +1025,7 @@ NSString getInsertString (String string, NSRange range) {
 	NSString str;
 	int charCount = getCharCount ();
 	int length = string.length ();
-	int selectionLength = range != null ? (int)/*64*/(range.length) : 0;
+	int selectionLength = range != null ? (int)(range.length) : 0;
 	if (charCount - selectionLength + length > textLimit) {
 		length = textLimit - charCount + selectionLength;
 		length = Math.max (0, length);
@@ -1050,9 +1050,9 @@ public int getLineCount () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) return 1;
 	NSTextStorage storage = ((NSTextView) view).textStorage ();
-	int count = (int)/*64*/storage.paragraphs ().count ();
+	int count = (int)storage.paragraphs ().count ();
 	NSString string = storage.string();
-	long /*int*/ length = string.length(), c;
+	long length = string.length(), c;
 	if (length == 0 || (c = string.characterAtIndex(length - 1)) == '\n' || c == '\r') {
 		count++;
 	}
@@ -1142,7 +1142,7 @@ public String getMessage () {
 	return message;
 }
 
-long /*int*/ getPosition (long /*int*/ x, long /*int*/ y) {
+long getPosition (long x, long y) {
 //	checkWidget ();
 	if ((style & SWT.MULTI) != 0) {
 		NSTextView widget = (NSTextView) view;
@@ -1179,13 +1179,13 @@ public Point getSelection () {
 	if ((style & SWT.SINGLE) != 0) {
 		if (selectionRange == null) {
 			NSString str = ((NSTextField) view).stringValue();
-			return new Point((int)/*64*/str.length (), (int)/*64*/str.length ());
+			return new Point((int)str.length (), (int)str.length ());
 		}
-		return new Point ((int)/*64*/selectionRange.location, (int)/*64*/(selectionRange.location + selectionRange.length));
+		return new Point ((int)selectionRange.location, (int)(selectionRange.location + selectionRange.length));
 	} else {
 		NSTextView widget = (NSTextView) view;
 		NSRange range = widget.selectedRange ();
-		return new Point ((int)/*64*/range.location, (int)/*64*/(range.location + range.length));
+		return new Point ((int)range.location, (int)(range.location + range.length));
 	}
 }
 
@@ -1202,11 +1202,11 @@ public Point getSelection () {
 public int getSelectionCount () {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) {
-		return selectionRange != null ? (int)/*64*/selectionRange.length : 0;
+		return selectionRange != null ? (int)selectionRange.length : 0;
 	} else {
 		NSTextView widget = (NSTextView) view;
 		NSRange range = widget.selectedRange ();
-		return (int)/*64*/range.length;
+		return (int)range.length;
 	}
 }
 
@@ -1230,7 +1230,7 @@ public String getSelectionText () {
 		NSTextView widget = (NSTextView) view;
 		NSRange range = widget.selectedRange ();
 		NSString str = widget.textStorage ().string ();
-		char[] buffer = new char [(int)/*64*/range.length];
+		char[] buffer = new char [(int)range.length];
 		str.getCharacters (buffer, range);
 		return new String (buffer);
 	}
@@ -1306,7 +1306,7 @@ public String getText (int start, int end) {
 		return new String (getEditText (start, end));
 	}
 	NSTextStorage storage = ((NSTextView) view).textStorage ();
-	end = Math.min (end, (int)/*64*/storage.length () - 1);
+	end = Math.min (end, (int)storage.length () - 1);
 	if (start > end) return ""; //$NON-NLS-1$
 	start = Math.max (0, start);
 	NSRange range = new NSRange ();
@@ -1348,7 +1348,7 @@ public char[] getTextChars () {
 		return getEditText ();
 	} else {
 		NSString str = ((NSTextView)view).textStorage ().string ();
-		int length = (int)/*64*/str.length ();
+		int length = (int)str.length ();
 		char [] buffer = new char [length];
 		NSRange range = new NSRange ();
 		range.length = length;
@@ -1496,7 +1496,7 @@ void insertEditText (String string) {
 }
 
 @Override
-boolean isEventView (long /*int*/ id) {
+boolean isEventView (long id) {
 	if ((style & SWT.MULTI) != 0) return super.isEventView (id);
 	return true;
 }
@@ -1717,7 +1717,7 @@ boolean sendKeyEvent (NSEvent nsEvent, int type) {
 	boolean result = super.sendKeyEvent (nsEvent, type);
 	if (!result) return result;
 	if (type != SWT.KeyDown) return result;
-	long /*int*/ modifierFlags = nsEvent.modifierFlags();
+	long modifierFlags = nsEvent.modifierFlags();
 	if ((modifierFlags & OS.NSCommandKeyMask) != 0) {
 		short keyCode = nsEvent.keyCode ();
 		switch (keyCode) {
@@ -1943,7 +1943,7 @@ void setEditText (char[] text) {
 }
 
 @Override
-void setFrameSize(long /*int*/ id, long /*int*/ sel, NSSize size) {
+void setFrameSize(long id, long sel, NSSize size) {
 	super.setFrameSize (id, sel, size);
 	/*
 	* Bug in Cocoa.  When a search field is resized while having
@@ -1973,13 +1973,13 @@ void setFont(NSFont font) {
 }
 
 @Override
-void setForeground (double /*float*/ [] color) {
+void setForeground (double [] color) {
 	NSColor nsColor;
 	if (color == null) {
 		nsColor = NSColor.textColor ();
 		if ((style & SWT.MULTI) != 0 && !isEnabled()) nsColor = NSColor.disabledControlTextColor();
 	} else {
-		double /*float*/ alpha = 1;
+		double alpha = 1;
 		if ((style & SWT.MULTI) != 0 && !isEnabled()) alpha = 0.5f;
 		nsColor = NSColor.colorWithDeviceRed (color [0], color [1], color [2], alpha);
 	}
@@ -2111,7 +2111,7 @@ public void setSelection (int start, int end) {
 	checkWidget ();
 	if ((style & SWT.SINGLE) != 0) {
 		NSString str = ((NSTextField) view).stringValue();
-		int length = (int)/*64*/str.length ();
+		int length = (int)str.length ();
 		int selStart = Math.min (Math.max (Math.min (start, end), 0), length);
 		int selEnd = Math.min (Math.max (Math.max (start, end), 0), length);
 		selectionRange = new NSRange ();
@@ -2123,7 +2123,7 @@ public void setSelection (int start, int end) {
 			fieldEditor.scrollRangeToVisible (selectionRange);
 		}
 	} else {
-		int length = (int)/*64*/((NSTextView) view).textStorage ().length ();
+		int length = (int)((NSTextView) view).textStorage ().length ();
 		int selStart = Math.min (Math.max (Math.min (start, end), 0), length);
 		int selEnd = Math.min (Math.max (Math.max (start, end), 0), length);
 		NSRange range = new NSRange ();
@@ -2190,7 +2190,7 @@ public void setTabs (int tabs) {
 	if (this.tabs == tabs) return;
 	this.tabs = tabs;
 	if ((style & SWT.SINGLE) != 0) return;
-	double /*float*/ size = textExtent("s").width * tabs;
+	double size = textExtent("s").width * tabs;
 	NSTextView widget = (NSTextView)view;
 	NSParagraphStyle defaultStyle = widget.defaultParagraphStyle();
 	NSMutableParagraphStyle paragraphStyle = new NSMutableParagraphStyle(defaultStyle.mutableCopy());
@@ -2355,7 +2355,7 @@ public void setTopIndex (int index) {
 }
 
 @Override
-boolean shouldChangeTextInRange_replacementString(long /*int*/ id, long /*int*/ sel, long /*int*/ affectedCharRange, long /*int*/ replacementString) {
+boolean shouldChangeTextInRange_replacementString(long id, long sel, long affectedCharRange, long replacementString) {
 	NSRange range = new NSRange();
 	OS.memmove(range, affectedCharRange, NSRange.sizeof);
 	boolean result = callSuperBoolean(id, sel, range, replacementString);
@@ -2370,9 +2370,9 @@ boolean shouldChangeTextInRange_replacementString(long /*int*/ id, long /*int*/
 	String newText = text;
 	if (hooks (SWT.Verify)) {
 		NSEvent currentEvent = display.application.currentEvent();
-		long /*int*/ type = currentEvent.type();
+		long type = currentEvent.type();
 		if (type != OS.NSKeyDown && type != OS.NSKeyUp) currentEvent = null;
-		newText = verifyText(text, (int)/*64*/range.location, (int)/*64*/(range.location+range.length),  currentEvent);
+		newText = verifyText(text, (int)range.location, (int)(range.location+range.length),  currentEvent);
 	}
 	if (newText == null) return false;
 	if (getCharCount() - range.length + newText.length() > textLimit) {
@@ -2423,20 +2423,20 @@ public void showSelection () {
 }
 
 @Override
-void textViewDidChangeSelection(long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void textViewDidChangeSelection(long id, long sel, long aNotification) {
 	NSNotification notification = new NSNotification (aNotification);
 	NSText editor = new NSText (notification.object ().id);
 	selectionRange = editor.selectedRange ();
 }
 
 @Override
-void textDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void textDidChange (long id, long sel, long aNotification) {
 	if ((style & SWT.SINGLE) != 0) super.textDidChange (id, sel, aNotification);
 	postEvent (SWT.Modify);
 }
 
 @Override
-NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange (long /*int*/ id, long /*int*/ sel, long /*int*/ aTextView, long /*int*/ oldSelectedCharRange, long /*int*/ newSelectedCharRange) {
+NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange (long id, long sel, long aTextView, long oldSelectedCharRange, long newSelectedCharRange) {
 	/*
 	* If the selection is changing as a result of the receiver getting focus
 	* then return the receiver's last selection range, otherwise the full
@@ -2457,7 +2457,7 @@ int traversalCode (int key, NSEvent theEvent) {
 	if ((style & SWT.MULTI) != 0) {
 		bits &= ~SWT.TRAVERSE_RETURN;
 		if (key == 48 /* Tab */ && theEvent != null) {
-			long /*int*/ modifiers = theEvent.modifierFlags ();
+			long modifiers = theEvent.modifierFlags ();
 			boolean next = (modifiers & OS.NSShiftKeyMask) == 0;
 			if (next && (modifiers & OS.NSControlKeyMask) == 0) {
 				bits &= ~(SWT.TRAVERSE_TAB_NEXT | SWT.TRAVERSE_TAB_PREVIOUS);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java
index 63a3dc438e..70cd65b720 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java
@@ -111,7 +111,7 @@ ToolBar(Composite parent, int style, boolean internal) {
 }
 
 @Override
-long /*int*/ accessibilityAttributeValue (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+long accessibilityAttributeValue (long id, long sel, long arg0) {
 	NSString nsAttributeName = new NSString(arg0);
 
 	if (id == accessibleHandle() && accessible != null) {
@@ -125,7 +125,7 @@ long /*int*/ accessibilityAttributeValue (long /*int*/ id, long /*int*/ sel, lon
 		if (nsAttributeName.isEqualToString (OS.NSAccessibilityRoleAttribute))
 			return role.id;
 		else {
-			long /*int*/ roleDescription = OS.NSAccessibilityRoleDescription(role.id, 0);
+			long roleDescription = OS.NSAccessibilityRoleDescription(role.id, 0);
 			return roleDescription;
 		}
 	} else if (nsAttributeName.isEqualToString(OS.NSAccessibilityChildrenAttribute)) {
@@ -146,7 +146,7 @@ long /*int*/ accessibilityAttributeValue (long /*int*/ id, long /*int*/ sel, lon
 }
 
 @Override
-boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
+boolean accessibilityIsIgnored(long id, long sel) {
 	// Toolbars aren't ignored.
 	if (id == view.id) return false;
 	return super.accessibilityIsIgnored(id, sel);
@@ -326,7 +326,7 @@ void destroyItem (ToolItem item) {
 }
 
 @Override
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rect) {
 	if (id != view.id) return;
 	if (background != null) {
 		fillBackground (view, context, rect, -1);
@@ -495,7 +495,7 @@ public int getRowCount () {
 }
 
 @Override
-boolean hasKeyboardFocus(long /*int*/ inId) {
+boolean hasKeyboardFocus(long inId) {
 	return hasFocus();
 }
 
@@ -773,7 +773,7 @@ public void setVisible(boolean visible) {
 }
 
 @Override
-long /*int*/ toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar, long /*int*/ itemIdentifier, boolean flag) {
+long toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar(long id, long sel, long toolbar, long itemIdentifier, boolean flag) {
 	NSString itemID = new NSString(itemIdentifier);
 	for (int j = 0; j < itemCount; j++) {
 		ToolItem item = items[j];
@@ -789,7 +789,7 @@ long /*int*/ toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar(long /*int*
  * return all of the item IDs.
  */
 @Override
-long /*int*/ toolbarAllowedItemIdentifiers(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar) {
+long toolbarAllowedItemIdentifiers(long id, long sel, long toolbar) {
 	NSMutableArray array = NSMutableArray.arrayWithCapacity(itemCount);
 	for (int i = 0; i < itemCount; i++) {
 		array.addObject(items[i].nsItem.itemIdentifier());
@@ -801,7 +801,7 @@ long /*int*/ toolbarAllowedItemIdentifiers(long /*int*/ id, long /*int*/ sel, lo
  * This delegate method isn't really needed because ToolBars aren't customizable, but it's required according to the documentation.
  */
 @Override
-long /*int*/ toolbarDefaultItemIdentifiers(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar) {
+long toolbarDefaultItemIdentifiers(long id, long sel, long toolbar) {
 	return toolbarAllowedItemIdentifiers(id, sel, toolbar);
 }
 
@@ -810,7 +810,7 @@ long /*int*/ toolbarDefaultItemIdentifiers(long /*int*/ id, long /*int*/ sel, lo
  * by setSelectedItemIdentifier.
  */
 @Override
-long /*int*/ toolbarSelectableItemIdentifiers(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar) {
+long toolbarSelectableItemIdentifiers(long id, long sel, long toolbar) {
 	NSMutableArray array = NSMutableArray.arrayWithCapacity(itemCount);
 	for (int i = 0; i < itemCount; i++) {
 		if ((items[i].style & SWT.RADIO) != 0) array.addObject(items[i].nsItem.itemIdentifier());
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java
index b3313d94d4..5547ece2b9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java
@@ -141,16 +141,16 @@ public ToolItem (ToolBar parent, int style, int index) {
 }
 
 @Override
-long /*int*/ accessibleHandle() {
+long accessibleHandle() {
 	if (button != null && button.cell() != null) return button.cell().id;
 	if (view != null) return view.id;
 	return 0;
 }
 
 @Override
-long /*int*/ accessibilityActionNames(long /*int*/ id, long /*int*/ sel) {
+long accessibilityActionNames(long id, long sel) {
 
-	long /*int*/ returnValue = super.accessibilityActionNames(id, sel);
+	long returnValue = super.accessibilityActionNames(id, sel);
 
 	if (id == accessibleHandle()) {
 		if ((style & SWT.DROP_DOWN) != 0) {
@@ -167,9 +167,9 @@ long /*int*/ accessibilityActionNames(long /*int*/ id, long /*int*/ sel) {
 }
 
 @Override
-long /*int*/ accessibilityAttributeNames(long /*int*/ id, long /*int*/ sel) {
+long accessibilityAttributeNames(long id, long sel) {
 
-	long /*int*/ returnValue = super.accessibilityAttributeNames(id, sel);
+	long returnValue = super.accessibilityAttributeNames(id, sel);
 
 	if (id == accessibleHandle()) {
 		if ((style & (SWT.CHECK|SWT.RADIO)) !=0) {
@@ -192,7 +192,7 @@ long /*int*/ accessibilityAttributeNames(long /*int*/ id, long /*int*/ sel) {
 }
 
 @Override
-long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+long accessibilityAttributeValue(long id, long sel, long arg0) {
 	NSString nsAttributeName = new NSString(arg0);
 
 	if (nsAttributeName.isEqualToString (OS.NSAccessibilityRoleAttribute) || nsAttributeName.isEqualToString (OS.NSAccessibilityRoleDescriptionAttribute)) {
@@ -205,7 +205,7 @@ long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long
 			if (nsAttributeName.isEqualToString (OS.NSAccessibilityRoleAttribute)) {
 				return roleText.id;
 			} else { // NSAccessibilityRoleDescriptionAttribute
-				long /*int*/ description = OS.NSAccessibilityRoleDescription (roleText.id, 0);
+				long description = OS.NSAccessibilityRoleDescription (roleText.id, 0);
 				return description;
 			}
 		}
@@ -242,7 +242,7 @@ long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long
 }
 
 @Override
-boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
+boolean accessibilityIsIgnored(long id, long sel) {
 	// The interesting part of a ToolItem is its button, if it has one.
 	if (id == accessibleHandle()) return false;
 	return super.accessibilityIsIgnored(id, sel);
@@ -425,7 +425,7 @@ void destroyWidget() {
 }
 
 @Override
-void drawImageWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ image, NSRect rect, long /*int*/ view) {
+void drawImageWithFrameInView (long id, long sel, long image, NSRect rect, long view) {
 	if (text.length () > 0) {
 		if ((parent.style & SWT.RIGHT) != 0) {
 			rect.x += 3;
@@ -433,7 +433,7 @@ void drawImageWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ i
 			rect.y += 3;
 		}
 	}
-	long /*int*/ cgContext = NSGraphicsContext.currentContext().graphicsPort();
+	long cgContext = NSGraphicsContext.currentContext().graphicsPort();
 	NSCell cell = new NSCell(id);
 	boolean drawSelected = (parent.nsToolbar != null) && getSelection() && ((style & SWT.CHECK) != 0) && !cell.isHighlighted();
 
@@ -458,7 +458,7 @@ void drawImageWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ i
 }
 
 @Override
-NSRect drawTitleWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ title, NSRect titleRect, long /*int*/ view) {
+NSRect drawTitleWithFrameInView (long id, long sel, long title, NSRect titleRect, long view) {
     boolean hiliteShadow = new NSButtonCell(id).isHighlighted() && text.length() > 0 && image == null;
 
     // An unbordered cell doesn't draw any highlighting when pushed or selected, so we have to do it here.
@@ -477,7 +477,7 @@ NSRect drawTitleWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/
 }
 
 @Override
-void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawWidget (long id, NSGraphicsContext context, NSRect rect) {
 	if (id == view.id) {
 		boolean drawSelected = getSelection() && (parent.nsToolbar == null);
 		if (drawSelected) {
@@ -751,12 +751,12 @@ boolean isDrawing () {
 }
 
 @Override
-long /*int*/ menuForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+long menuForEvent (long id, long sel, long theEvent) {
 	return parent.menuForEvent (id, sel, theEvent);
 }
 
 @Override
-void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDown(long id, long sel, long theEvent) {
 	if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseDown)) return;
 	Display display = this.display;
 	display.trackingControl = parent;
@@ -773,55 +773,55 @@ void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-boolean mouseDownCanMoveWindow(long /*int*/ id, long /*int*/ sel) {
+boolean mouseDownCanMoveWindow(long id, long sel) {
 	if (id == view.id) return false;
 	return super.mouseDownCanMoveWindow(id, sel);
 }
 
 @Override
-void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseUp(long id, long sel, long theEvent) {
 	if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseUp)) return;
 	super.mouseUp(id, sel, theEvent);
 }
 
 @Override
-void mouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDragged(long id, long sel, long theEvent) {
 	if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseMove)) return;
 	super.mouseDragged(id, sel, theEvent);
 }
 
 @Override
-void rightMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void rightMouseDown(long id, long sel, long theEvent) {
 	if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseDown)) return;
 	super.rightMouseDown(id, sel, theEvent);
 }
 
 @Override
-void rightMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void rightMouseUp(long id, long sel, long theEvent) {
 	if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseUp)) return;
 	super.rightMouseUp(id, sel, theEvent);
 }
 
 @Override
-void rightMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void rightMouseDragged(long id, long sel, long theEvent) {
 	if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseMove)) return;
 	super.rightMouseDragged(id, sel, theEvent);
 }
 
 @Override
-void otherMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void otherMouseDown(long id, long sel, long theEvent) {
 	if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseDown)) return;
 	super.otherMouseDown(id, sel, theEvent);
 }
 
 @Override
-void otherMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void otherMouseUp(long id, long sel, long theEvent) {
 	if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseUp)) return;
 	super.otherMouseUp(id, sel, theEvent);
 }
 
 @Override
-void otherMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void otherMouseDragged(long id, long sel, long theEvent) {
 	if (!parent.mouseEvent(parent.view.id, sel, theEvent, SWT.MouseMove)) return;
 	super.otherMouseDragged(id, sel, theEvent);
 }
@@ -1308,7 +1308,7 @@ void updateImage (boolean layout) {
 }
 
 @Override
-boolean validateMenuItem(long /*int*/ id, long /*int*/ sel, long /*int*/ menuItem) {
+boolean validateMenuItem(long id, long sel, long menuItem) {
 	return isEnabled();
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
index e28748b86b..5ea6a223c2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
@@ -368,7 +368,7 @@ void drawRectangles (NSWindow window, Rectangle [] rects, boolean erase) {
 	context.setCompositingOperation(erase ? OS.NSCompositeClear : OS.NSCompositeSourceOver);
 	NSRect rectFrame = new NSRect();
 	NSPoint globalPoint = new NSPoint();
-	double /*float*/ screenHeight = display.getPrimaryFrame().height;
+	double screenHeight = display.getPrimaryFrame().height;
 	for (int i=0; i<rects.length; i++) {
 		Rectangle rect = rects [i];
 		rectFrame.x = rect.x + parentOrigin.x;
@@ -552,7 +552,7 @@ void mouse (NSEvent nsEvent) {
 		}
 		oldX = newX;  oldY = newY;
 	}
-	switch ((int)/*64*/nsEvent.type()) {
+	switch ((int)nsEvent.type()) {
 		case OS.NSLeftMouseUp:
 		case OS.NSRightMouseUp:
 		case OS.NSOtherMouseUp:
@@ -561,8 +561,8 @@ void mouse (NSEvent nsEvent) {
 }
 
 void key (NSEvent nsEvent) {
-	int nsType = (int)/*64*/nsEvent.type();
-	long /*int*/ modifierFlags = nsEvent.modifierFlags();
+	int nsType = (int)nsEvent.type();
+	long modifierFlags = nsEvent.modifierFlags();
 	int nsKeyCode = nsEvent.keyCode();
 	int keyCode = Display.translateKey (nsKeyCode);
 
@@ -780,7 +780,7 @@ public boolean open () {
 	 * NSWindow. Fix is to use one NSWindow per screen.
 	 */
 	NSArray screens = NSScreen.screens();
-	int count = (int)/*64*/screens.count();
+	int count = (int)screens.count();
 	windows = new NSWindow [count];
 	for (int i = 0; i < count; i++) {
 		NSScreen screen = new NSScreen(screens.objectAtIndex(i));
@@ -824,7 +824,7 @@ public boolean open () {
 	NSApplication application = NSApplication.sharedApplication();
 	NSEvent currentEvent = application.currentEvent();
 	if (currentEvent != null) {
-		switch ((int)/*64*/currentEvent.type()) {
+		switch ((int)currentEvent.type()) {
 			case OS.NSLeftMouseDown:
 			case OS.NSLeftMouseDragged:
 			case OS.NSRightMouseDown:
@@ -859,7 +859,7 @@ public boolean open () {
 			display.runDeferredLayouts ();
 			NSEvent event = application.nextEventMatchingMask(OS.NSAnyEventMask, NSDate.distantFuture(), OS.NSDefaultRunLoopMode, true);
 			if (event == null) continue;
-			int type = (int)/*64*/event.type();
+			int type = (int)event.type();
 			switch (type) {
 				case OS.NSLeftMouseUp:
 				case OS.NSRightMouseUp:
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java
index edeab7bfc6..558908bb5e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java
@@ -511,7 +511,7 @@ void displayMenu () {
 
 boolean shouldShowMenu (NSEvent event) {
 	if (!hooks(SWT.MenuDetect)) return false;
-	switch ((int)/*64*/event.type()) {
+	switch ((int)event.type()) {
 		case OS.NSRightMouseDown: return true;
 		case OS.NSLeftMouseDown:
 			if (!(hooks(SWT.Selection) || hooks(SWT.DefaultSelection))) {
@@ -529,7 +529,7 @@ boolean shouldShowMenu (NSEvent event) {
 }
 
 @Override
-void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDown(long id, long sel, long theEvent) {
 	NSEvent nsEvent = new NSEvent(theEvent);
 	highlight = true;
 	updateImage();
@@ -541,7 +541,7 @@ void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-void mouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDragged(long id, long sel, long theEvent) {
 	NSEvent nsEvent = new NSEvent(theEvent);
 	NSRect frame = view.frame();
 	boolean oldHighlight = highlight;
@@ -557,7 +557,7 @@ void mouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseUp(long id, long sel, long theEvent) {
 	if (highlight) {
 		NSEvent nsEvent = new NSEvent(theEvent);
 		if (nsEvent.type() == OS.NSLeftMouseUp) {
@@ -570,28 +570,28 @@ void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-void rightMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void rightMouseDown(long id, long sel, long theEvent) {
 	mouseDown(id, sel, theEvent);
 }
 
 @Override
-void rightMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void rightMouseUp(long id, long sel, long theEvent) {
 	mouseUp(id, sel, theEvent);
 }
 
 @Override
-void rightMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void rightMouseDragged(long id, long sel, long theEvent) {
 	mouseDragged(id, sel, theEvent);
 }
 
 @Override
-void drawRect(long /*int*/ id, long /*int*/ sel, NSRect rect) {
+void drawRect(long id, long sel, NSRect rect) {
 	item.drawStatusBarBackgroundInRect(rect, highlight);
 	super.drawRect(id, sel, rect);
 }
 
 void updateImage () {
-	double /*float*/ width = 0;
+	double width = 0;
 	Image image = this.image;
 	if (highlight && highlightImage != null) image = highlightImage;
 	if (image == null) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java
index 6fcb41098f..81a60d6717 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java
@@ -91,7 +91,7 @@ public class Tree extends Composite {
 	Rectangle imageBounds;
 	TreeItem insertItem;
 	boolean insertBefore;
-	double /*float*/ [] headerBackground, headerForeground;
+	double [] headerBackground, headerForeground;
 
 	/* Used to control drop feedback when DND.FEEDBACK_EXPAND and DND.FEEDBACK_SCROLL is set/not set */
 	boolean shouldExpand = true, shouldScroll = true;
@@ -166,20 +166,20 @@ TreeItem _getItem (TreeItem parentItem, int index, boolean create) {
 }
 
 @Override
-boolean acceptsFirstResponder (long /*int*/ id, long /*int*/ sel) {
+boolean acceptsFirstResponder (long id, long sel) {
 	return true;
 }
 
 @Override
-long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
-	long /*int*/ returnValue = 0;
+long accessibilityAttributeValue(long id, long sel, long arg0) {
+	long returnValue = 0;
 	NSString attributeName = new NSString(arg0);
 
 	// If the check column is visible, don't report it back as a column for accessibility purposes.
 	// The check column is meant to appear as a part of the first column.
 	if (attributeName.isEqualToString (OS.NSAccessibilityColumnsAttribute) || attributeName.isEqualToString(OS.NSAccessibilityVisibleColumnsAttribute)) {
 		if ((style & SWT.CHECK) != 0) {
-			long /*int*/ superValue = super.accessibilityAttributeValue(id, sel, arg0);
+			long superValue = super.accessibilityAttributeValue(id, sel, arg0);
 			if (superValue != 0) {
 				NSArray columns = new NSArray(superValue);
 				NSMutableArray columnsWithoutCheck = NSMutableArray.arrayWithCapacity(columns.count() - 1);
@@ -276,17 +276,17 @@ int calculateWidth (TreeItem[] items, int index, GC gc, boolean recurse) {
 }
 
 @Override
-NSSize cellSize (long /*int*/ id, long /*int*/ sel) {
+NSSize cellSize (long id, long sel) {
 	NSSize size = super.cellSize(id, sel);
 	NSCell cell = new NSCell(id);
 	NSImage image = cell.image();
 	if (image != null) size.width += imageBounds.width + IMAGE_GAP;
 	if (hooks(SWT.MeasureItem)) {
-		long /*int*/ [] outValue = new long /*int*/ [1];
+		long [] outValue = new long [1];
 		OS.object_getInstanceVariable(id, Display.SWT_ROW, outValue);
 		TreeItem item = (TreeItem) display.getWidget (outValue [0]);
 		OS.object_getInstanceVariable(id, Display.SWT_COLUMN, outValue);
-		long /*int*/ tableColumn = outValue[0];
+		long tableColumn = outValue[0];
 		int columnIndex = 0;
 		for (int i=0; i<columnCount; i++) {
 			if (columns [i].nsColumn.id == tableColumn) {
@@ -300,13 +300,13 @@ NSSize cellSize (long /*int*/ id, long /*int*/ sel) {
 }
 
 @Override
-boolean canDragRowsWithIndexes_atPoint(long /*int*/ id, long /*int*/ sel, long /*int*/ rowIndexes, NSPoint mouseDownPoint) {
+boolean canDragRowsWithIndexes_atPoint(long id, long sel, long rowIndexes, NSPoint mouseDownPoint) {
 	if (!super.canDragRowsWithIndexes_atPoint(id, sel, rowIndexes, mouseDownPoint)) return false;
 
 	// If the current row is not selected and the user is not attempting to modify the selection, select the row first.
 	NSTableView widget = (NSTableView)view;
-	long /*int*/ row = widget.rowAtPoint(mouseDownPoint);
-	long /*int*/ modifiers = NSApplication.sharedApplication().currentEvent().modifierFlags();
+	long row = widget.rowAtPoint(mouseDownPoint);
+	long modifiers = NSApplication.sharedApplication().currentEvent().modifierFlags();
 
 	boolean drag = (state & DRAG_DETECT) != 0 && hooks (SWT.DragDetect);
 	if (drag) {
@@ -466,7 +466,7 @@ void clearCachedWidth (TreeItem[] items) {
 }
 
 @Override
-void collapseItem_collapseChildren (long /*int*/ id, long /*int*/ sel, long /*int*/ itemID, boolean children) {
+void collapseItem_collapseChildren (long id, long sel, long itemID, boolean children) {
 	TreeItem item = (TreeItem)display.getWidget(itemID);
 	if (item == null) return;
 	if (!ignoreExpand) item.sendExpand (false, children);
@@ -478,7 +478,7 @@ void collapseItem_collapseChildren (long /*int*/ id, long /*int*/ sel, long /*in
 }
 
 @Override
-long /*int*/ columnAtPoint(long /*int*/ id, long /*int*/ sel, NSPoint point) {
+long columnAtPoint(long id, long sel, NSPoint point) {
 	if ((style & SWT.CHECK) != 0) {
 		if (point.x <= getCheckColumnWidth() && point.y < headerView.frame().height) return 1;
 	}
@@ -505,7 +505,7 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
 		width = wHint;
 	}
 	if (hHint == SWT.DEFAULT) {
-		height = (int)/*64*/((NSOutlineView) view).numberOfRows () * getItemHeight () + getHeaderHeight ();
+		height = (int)((NSOutlineView) view).numberOfRows () * getItemHeight () + getHeaderHeight ();
 	} else {
 		height = hHint;
 	}
@@ -604,7 +604,7 @@ void createHandle () {
 		widget.setOutlineTableColumn (checkColumn);
 		checkColumn.setResizingMask (OS.NSTableColumnNoResizing);
 		checkColumn.setEditable (false);
-		long /*int*/ cls = NSButton.cellClass (); /* use our custom cell class */
+		long cls = NSButton.cellClass (); /* use our custom cell class */
 		buttonCell = new NSButtonCell (OS.class_createInstance (cls, 0));
 		buttonCell.init ();
 		checkColumn.setDataCell (buttonCell);
@@ -773,7 +773,7 @@ Color defaultForeground () {
 }
 
 @Override
-void deselectAll(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
+void deselectAll(long id, long sel, long sender) {
 	if (preventSelect && !ignoreSelect) return;
 	if ((style & SWT.SINGLE) != 0 && !ignoreSelect) {
 		if ( ((NSTableView)view).selectedRow() != -1) return;
@@ -782,7 +782,7 @@ void deselectAll(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
 }
 
 @Override
-void deselectRow (long /*int*/ id, long /*int*/ sel, long /*int*/ index) {
+void deselectRow (long id, long sel, long index) {
 	if (preventSelect && !ignoreSelect) return;
 	if ((style & SWT.SINGLE) != 0 && !ignoreSelect) {
 		if ( ((NSTableView)view).selectedRow() == index) return;
@@ -836,7 +836,7 @@ public void deselect (TreeItem item) {
 	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (item.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	NSOutlineView widget = (NSOutlineView)view;
-	long /*int*/ row = widget.rowForItem(item.handle);
+	long row = widget.rowForItem(item.handle);
 	ignoreSelect = true;
 	widget.deselectRow (row);
 	ignoreSelect = false;
@@ -931,9 +931,9 @@ void destroyItem (TreeColumn column) {
 	}
 
 	NSArray array = ((NSOutlineView)view).tableColumns ();
-	int arraySize = (int)/*64*/array.count ();
+	int arraySize = (int)array.count ();
 	for (int i = oldIndex; i < arraySize; i++) {
-		long /*int*/ columnId = array.objectAtIndex (i).id;
+		long columnId = array.objectAtIndex (i).id;
 		for (int j = 0; j < columnCount; j++) {
 			if (columns[j].nsColumn.id == columnId) {
 				columns [j].sendEvent (SWT.Move);
@@ -988,14 +988,14 @@ boolean dragDetect(int x, int y, boolean filter, boolean[] consume) {
 }
 
 @Override
-void drawBackgroundInClipRect(long /*int*/ id, long /*int*/ sel, NSRect rect) {
+void drawBackgroundInClipRect(long id, long sel, NSRect rect) {
 	super.drawViewBackgroundInRect(id, sel, rect);
 	if (id != view.id) return;
 	fillBackground (view, NSGraphicsContext.currentContext(), rect, -1);
 }
 
 @Override
-void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect rect, long /*int*/ view) {
+void drawInteriorWithFrame_inView (long id, long sel, NSRect rect, long view) {
 	boolean hooksErase = hooks (SWT.EraseItem);
 	boolean hooksPaint = hooks (SWT.PaintItem);
 	boolean hooksMeasure = hooks (SWT.MeasureItem);
@@ -1003,17 +1003,17 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect rec
 	NSTextFieldCell cell = new NSTextFieldCell (id);
 
 	NSOutlineView widget = (NSOutlineView)this.view;
-	long /*int*/ [] outValue = new long /*int*/ [1];
+	long [] outValue = new long [1];
 	OS.object_getInstanceVariable(id, Display.SWT_ROW, outValue);
-	long /*int*/ rowIndex = widget.rowForItem(new id(outValue [0]));
+	long rowIndex = widget.rowForItem(new id(outValue [0]));
 	if (rowIndex == -1) {
 		return;	// the row item doesn't exist or has been disposed
 	}
 	TreeItem item = (TreeItem) display.getWidget (outValue [0]);
 	if (item == null) return;
 	OS.object_getInstanceVariable(id, Display.SWT_COLUMN, outValue);
-	long /*int*/ tableColumn = outValue[0];
-	long /*int*/ nsColumnIndex = widget.tableColumns().indexOfObjectIdenticalTo(new id(tableColumn));
+	long tableColumn = outValue[0];
+	long nsColumnIndex = widget.tableColumns().indexOfObjectIdenticalTo(new id(tableColumn));
 	int columnIndex = 0;
 	for (int i=0; i<columnCount; i++) {
 		if (columns [i].nsColumn.id == tableColumn) {
@@ -1050,7 +1050,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect rec
 		NSRect rowRect = widget.rectOfRow (rowIndex);
 		cellRect.width = rowRect.width;
 	}
-	double /*float*/ offsetX = 0, offsetY = 0;
+	double offsetX = 0, offsetY = 0;
 	if (hooksPaint || hooksErase) {
 		NSRect frameCell = widget.frameOfCellAtColumn(nsColumnIndex, rowIndex);
 		offsetX = rect.x - frameCell.x;
@@ -1132,7 +1132,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect rec
 
 	if (drawBackground && !drawSelection) {
 		context.saveGraphicsState ();
-		double /*float*/ [] colorRGB = background.handle;
+		double [] colorRGB = background.handle;
 		NSColor color = NSColor.colorWithDeviceRed (colorRGB[0], colorRGB[1], colorRGB[2], 1f);
 		color.setFill ();
 		NSBezierPath.fillRect (cellRect);
@@ -1186,7 +1186,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect rec
 			* foreground color to black when the cell is highlighted. The text
 			* still draws white.  The fix is to draw the text and not call super.
 			*/
-			double /*float*/ [] color = userForeground.handle;
+			double [] color = userForeground.handle;
 			if (color[0] == 0 && color[1] == 0 && color[2] == 0 && color[3] == 1) {
 				NSMutableAttributedString newStr = new NSMutableAttributedString(cell.attributedStringValue().mutableCopy());
 				NSRange range = new NSRange();
@@ -1270,14 +1270,14 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect rec
 }
 
 @Override
-void drawWithExpansionFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ view) {
+void drawWithExpansionFrame_inView (long id, long sel, NSRect cellFrame, long view) {
 	drawExpansion = true;
 	super.drawWithExpansionFrame_inView(id, sel, cellFrame, view);
 	drawExpansion = false;
 }
 
 @Override
-void expandItem_expandChildren (long /*int*/ id, long /*int*/ sel, long /*int*/ itemID, boolean children) {
+void expandItem_expandChildren (long id, long sel, long itemID, boolean children) {
 	TreeItem item = (TreeItem)display.getWidget(itemID);
 	if (item == null) return;
 	if (!ignoreExpand) item.sendExpand (true, children);
@@ -1297,7 +1297,7 @@ void expandItem_expandChildren (long /*int*/ id, long /*int*/ sel, long /*int*/
 }
 
 @Override
-NSRect expansionFrameWithFrame_inView(long /*int*/ id, long /*int*/ sel, NSRect cellRect, long /*int*/ view) {
+NSRect expansionFrameWithFrame_inView(long id, long sel, NSRect cellRect, long view) {
 	if (toolTipText == null) {
 		NSRect rect = super.expansionFrameWithFrame_inView(id, sel, cellRect, view);
 		NSCell cell = new NSCell(id);
@@ -1346,7 +1346,7 @@ Widget findTooltip (NSPoint pt) {
 	NSTableHeaderView headerView = widget.headerView();
 	if (headerView != null) {
 		pt = headerView.convertPoint_fromView_ (pt, null);
-		long /*int*/ index = headerView.columnAtPoint (pt);
+		long index = headerView.columnAtPoint (pt);
 		if (index != -1) {
 			NSArray nsColumns = widget.tableColumns ();
 			id nsColumn = nsColumns.objectAtIndex (index);
@@ -1684,7 +1684,7 @@ public TreeItem getItem (Point point) {
 	NSPoint pt = new NSPoint();
 	pt.x = point.x;
 	pt.y = point.y;
-	int row = (int)/*64*/widget.rowAtPoint(pt);
+	int row = (int)widget.rowAtPoint(pt);
 	if (row == -1) return null;
 	NSRect rect = widget.frameOfOutlineCellAtRow(row);
 	if (OS.NSPointInRect(pt, rect)) return null;
@@ -1825,8 +1825,8 @@ public TreeItem [] getSelection () {
 		return new TreeItem [0];
 	}
 	NSIndexSet selection = widget.selectedRowIndexes ();
-	int count = (int)/*64*/selection.count ();
-	long /*int*/ [] indexBuffer = new long /*int*/ [count];
+	int count = (int)selection.count ();
+	long [] indexBuffer = new long [count];
 	selection.getIndexes (indexBuffer, count, 0);
 	TreeItem [] result = new TreeItem [count];
 	for (int i=0; i<count; i++) {
@@ -1851,7 +1851,7 @@ public TreeItem [] getSelection () {
  */
 public int getSelectionCount () {
 	checkWidget ();
-	return (int)/*64*/((NSOutlineView) view).numberOfSelectedRows ();
+	return (int)((NSOutlineView) view).numberOfSelectedRows ();
 }
 
 /**
@@ -1929,14 +1929,14 @@ public TreeItem getTopItem () {
 		}
 	}
 	NSOutlineView outlineView = (NSOutlineView)view;
-	long /*int*/ index = outlineView.rowAtPoint (point);
+	long index = outlineView.rowAtPoint (point);
 	if (index == -1) return null; /* empty */
 	id item = outlineView.itemAtRow (index);
 	return (TreeItem)display.getWidget (item.id);
 }
 
 @Override
-NSRect headerRectOfColumn (long /*int*/ id, long /*int*/ sel, long /*int*/ column) {
+NSRect headerRectOfColumn (long id, long sel, long column) {
 	if ((style & SWT.CHECK) == 0) return callSuperRect(id, sel, column);
 
 	if (column == 0) {
@@ -1955,7 +1955,7 @@ NSRect headerRectOfColumn (long /*int*/ id, long /*int*/ sel, long /*int*/ colum
 }
 
 @Override
-void highlightSelectionInClipRect(long /*int*/ id, long /*int*/ sel, long /*int*/ rect) {
+void highlightSelectionInClipRect(long id, long sel, long rect) {
 	if (hooks (SWT.EraseItem)) return;
 	if ((style & SWT.HIDE_SELECTION) != 0 && !hasFocus()) return;
 	NSRect clipRect = new NSRect ();
@@ -1964,7 +1964,7 @@ void highlightSelectionInClipRect(long /*int*/ id, long /*int*/ sel, long /*int*
 }
 
 @Override
-long /*int*/ hitTestForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event, NSRect rect, long /*int*/ controlView) {
+long hitTestForEvent (long id, long sel, long event, NSRect rect, long controlView) {
 	/*
 	* For some reason, the cell class needs to implement hitTestForEvent:inRect:ofView:,
 	* otherwise the double action selector is not called properly.
@@ -1973,14 +1973,14 @@ long /*int*/ hitTestForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ ev
 }
 
 @Override
-long /*int*/ image (long /*int*/ id, long /*int*/ sel) {
-	long /*int*/ [] image = new long /*int*/ [1];
+long image (long id, long sel) {
+	long [] image = new long [1];
 	OS.object_getInstanceVariable(id, Display.SWT_IMAGE, image);
 	return image[0];
 }
 
 @Override
-NSRect imageRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
+NSRect imageRectForBounds (long id, long sel, NSRect cellFrame) {
 	NSImage image = new NSCell(id).image();
 	if (image != null) {
 		cellFrame.x += IMAGE_GAP;
@@ -1991,7 +1991,7 @@ NSRect imageRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame)
 }
 
 int indexOf (NSTableColumn column) {
-	return (int)/*64*/((NSTableView)view).tableColumns().indexOfObjectIdenticalTo(column);
+	return (int)((NSTableView)view).tableColumns().indexOfObjectIdenticalTo(column);
 }
 
 /**
@@ -2066,13 +2066,13 @@ boolean isTrim (NSView view) {
 }
 
 @Override
-void keyDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void keyDown(long id, long sel, long theEvent) {
 	ignoreSelect = preventSelect = false;
 	super.keyDown(id, sel, theEvent);
 }
 
 @Override
-long /*int*/ menuForEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+long menuForEvent(long id, long sel, long theEvent) {
 	if (display.lastHandledMenuForEventId == theEvent) return 0;
 	if (id != headerView.id) {
 		/*
@@ -2088,7 +2088,7 @@ long /*int*/ menuForEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ theEve
 
 		// select the row that was clicked before showing the menu for the event
 		NSPoint mousePoint = view.convertPoint_fromView_(event.locationInWindow(), null);
-		long /*int*/ row = tree.rowAtPoint(mousePoint);
+		long row = tree.rowAtPoint(mousePoint);
 
 		// figure out if the row that was just clicked on is currently selected
 		if (selectedRowIndexes.containsIndex(row) == false) {
@@ -2104,7 +2104,7 @@ long /*int*/ menuForEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ theEve
 }
 
 @Override
-void mouseDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDown (long id, long sel, long theEvent) {
 	if (id == view.id) {
 		// Bug/feature in Cocoa:  If the tree has a context menu we just set it visible instead of returning
 		// it from menuForEvent:.  This has the side effect, however, of sending control-click to the NSTableView,
@@ -2116,17 +2116,17 @@ void mouseDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-void mouseDownSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDownSuper(long id, long sel, long theEvent) {
 	ignoreSelect = preventSelect = false;
 	boolean check = false;
 	NSEvent nsEvent = new NSEvent(theEvent);
 	NSOutlineView widget = (NSOutlineView)view;
 	NSPoint pt = view.convertPoint_fromView_(nsEvent.locationInWindow(), null);
-	int row = (int)/*64*/widget.rowAtPoint(pt);
+	int row = (int)widget.rowAtPoint(pt);
 	NSObject itemID = null;
 	if (row != -1) itemID = new NSObject(widget.itemAtRow(row));
 	if (row != -1 && (style & SWT.CHECK) != 0) {
-		int column = (int)/*64*/widget.columnAtPoint(pt);
+		int column = (int)widget.columnAtPoint(pt);
 		NSCell cell = widget.preparedCellAtColumn(column, row);
 		if (cell != null && cell.isKindOfClass(OS.class_NSButtonCell) && cell.isEnabled()) {
 			NSRect checkRect = cell.imageRectForBounds(widget.frameOfCellAtColumn(column, row));
@@ -2151,7 +2151,7 @@ void mouseDownSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
 }
 
 @Override
-boolean needsPanelToBecomeKey (long /*int*/ id, long /*int*/ sel) {
+boolean needsPanelToBecomeKey (long id, long sel) {
 	return false;
 }
 
@@ -2162,10 +2162,10 @@ boolean needsPanelToBecomeKey (long /*int*/ id, long /*int*/ sel) {
  * override [NSCell nextState] to go directly to the desired state.
  */
 @Override
-long /*int*/ nextState (long /*int*/ id, long /*int*/ sel) {
+long nextState (long id, long sel) {
 	NSOutlineView outlineView = (NSOutlineView)view;
-	int index = (int)/*64*/outlineView.clickedRow();
-	if (index == -1) index = (int)/*64*/outlineView.selectedRow ();
+	int index = (int)outlineView.clickedRow();
+	if (index == -1) index = (int)outlineView.selectedRow ();
 	TreeItem item = (TreeItem)display.getWidget (outlineView.itemAtRow (index).id);
 	if (item.grayed) {
 		return item.checked ? OS.NSOffState : OS.NSMixedState;
@@ -2174,9 +2174,9 @@ long /*int*/ nextState (long /*int*/ id, long /*int*/ sel) {
 }
 
 @Override
-long /*int*/ outlineView_child_ofItem (long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ index, long /*int*/ itemID) {
+long outlineView_child_ofItem (long id, long sel, long outlineView, long index, long itemID) {
 	TreeItem parent = (TreeItem) display.getWidget (itemID);
-	TreeItem item = _getItem (parent, (int)/*64*/index, true);
+	TreeItem item = _getItem (parent, (int)index, true);
 	if (item != null && item.handle != null) {
 		return item.handle.id;
 	}
@@ -2184,14 +2184,14 @@ long /*int*/ outlineView_child_ofItem (long /*int*/ id, long /*int*/ sel, long /
 }
 
 @Override
-void outlineView_didClickTableColumn (long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ tableColumn) {
+void outlineView_didClickTableColumn (long id, long sel, long outlineView, long tableColumn) {
 	TreeColumn column = getColumn (new id (tableColumn));
 	if (column == null) return; /* either CHECK column or firstColumn in 0-column Tree */
 	column.sendSelectionEvent (SWT.Selection);
 }
 
 @Override
-long /*int*/ outlineView_objectValueForTableColumn_byItem (long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ tableColumn, long /*int*/ itemID) {
+long outlineView_objectValueForTableColumn_byItem (long id, long sel, long outlineView, long tableColumn, long itemID) {
 	TreeItem item = (TreeItem) display.getWidget (itemID);
 	checkData (item);
 	if (checkColumn != null && tableColumn == checkColumn.id) {
@@ -2212,24 +2212,24 @@ long /*int*/ outlineView_objectValueForTableColumn_byItem (long /*int*/ id, long
 }
 
 @Override
-boolean outlineView_isItemExpandable (long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ item) {
+boolean outlineView_isItemExpandable (long id, long sel, long outlineView, long item) {
 	if (item == 0) return true;
 	return ((TreeItem) display.getWidget (item)).itemCount != 0;
 }
 
 @Override
-long /*int*/ outlineView_numberOfChildrenOfItem (long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ item) {
+long outlineView_numberOfChildrenOfItem (long id, long sel, long outlineView, long item) {
 	if (item == 0) return itemCount;
 	return ((TreeItem) display.getWidget (item)).itemCount;
 }
 
 @Override
-boolean outlineView_shouldExpandItem_item (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+boolean outlineView_shouldExpandItem_item (long id, long sel, long arg0, long arg1) {
 	return shouldExpand;
 }
 
 @Override
-boolean outlineView_shouldReorderColumn_toColumn(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ currentColIndex, long /*int*/ newColIndex) {
+boolean outlineView_shouldReorderColumn_toColumn(long id, long sel, long aTableView, long currentColIndex, long newColIndex) {
 	// Check column should never move and no column can be dragged to the left of it, if present.
 	if ((style & SWT.CHECK) != 0) {
 		if (currentColIndex == 0) return false;
@@ -2248,17 +2248,17 @@ boolean outlineView_shouldReorderColumn_toColumn(long /*int*/ id, long /*int*/ s
 }
 
 @Override
-boolean outlineView_shouldTrackCell_forTableColumn_item(long /*int*/ id, long /*int*/ sel, long /*int*/ table, long /*int*/ cell, long /*int*/ tableColumn, long /*int*/ item) {
+boolean outlineView_shouldTrackCell_forTableColumn_item(long id, long sel, long table, long cell, long tableColumn, long item) {
 	if ((style & SWT.CHECK) != 0) {
 		if (new NSCell(cell).isKindOfClass(OS.class_NSButtonCell)) return true;
 	}
 	NSOutlineView widget = (NSOutlineView)view;
-	long /*int*/ rowIndex = widget.rowForItem(new id(item));
+	long rowIndex = widget.rowForItem(new id(item));
 	return widget.isRowSelected(rowIndex);
 }
 
 @Override
-void outlineView_willDisplayCell_forTableColumn_item (long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ cell, long /*int*/ tableColumn, long /*int*/ itemID) {
+void outlineView_willDisplayCell_forTableColumn_item (long id, long sel, long outlineView, long cell, long tableColumn, long itemID) {
 	if (checkColumn != null && tableColumn == checkColumn.id) return;
 	TreeItem item = (TreeItem) display.getWidget(itemID);
 	int index = 0;
@@ -2324,7 +2324,7 @@ void outlineView_willDisplayCell_forTableColumn_item (long /*int*/ id, long /*in
 }
 
 @Override
-void outlineViewColumnDidMove (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void outlineViewColumnDidMove (long id, long sel, long aNotification) {
 	NSNotification notification = new NSNotification (aNotification);
 	NSDictionary userInfo = notification.userInfo ();
 	NSString nsstring = (NSString) new NSString().alloc();
@@ -2353,7 +2353,7 @@ void outlineViewColumnDidMove (long /*int*/ id, long /*int*/ sel, long /*int*/ a
 }
 
 @Override
-void outlineViewColumnDidResize (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void outlineViewColumnDidResize (long id, long sel, long aNotification) {
 	NSNotification notification = new NSNotification (aNotification);
 	NSDictionary userInfo = notification.userInfo ();
 	NSString nsstring = (NSString) new NSString().alloc();
@@ -2371,7 +2371,7 @@ void outlineViewColumnDidResize (long /*int*/ id, long /*int*/ sel, long /*int*/
 	if (index == -1) return; /* column was disposed in Resize callback */
 
 	NSArray nsColumns = outlineView.tableColumns ();
-	int columnCount = (int)/*64*/outlineView.numberOfColumns ();
+	int columnCount = (int)outlineView.numberOfColumns ();
 	for (int i = index + 1; i < columnCount; i++) {
 		columnId = nsColumns.objectAtIndex (i);
 		column = getColumn (columnId);
@@ -2383,7 +2383,7 @@ void outlineViewColumnDidResize (long /*int*/ id, long /*int*/ sel, long /*int*/
 }
 
 @Override
-void scrollClipViewToPoint (long /*int*/ id, long /*int*/ sel, long /*int*/ clipView, NSPoint point) {
+void scrollClipViewToPoint (long id, long sel, long clipView, NSPoint point) {
 	if (shouldScroll) {
 		super.scrollClipViewToPoint(id, sel, clipView, point);
 		if ((style & SWT.CHECK) != 0 && columnCount > 0 && ((NSOutlineView) view).headerView () != null) {
@@ -2402,7 +2402,7 @@ void scrollClipViewToPoint (long /*int*/ id, long /*int*/ sel, long /*int*/ clip
 void sendSelection () {
 	if (ignoreSelect) return;
 	NSOutlineView widget = (NSOutlineView) view;
-	int row = (int)/*64*/widget.selectedRow ();
+	int row = (int)widget.selectedRow ();
 	if (row == -1)
 		sendSelectionEvent (SWT.Selection);
 	else {
@@ -2416,19 +2416,19 @@ void sendSelection () {
 }
 
 @Override
-void outlineViewSelectionDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void outlineViewSelectionDidChange (long id, long sel, long notification) {
 	if (didSelect) return;
 	sendSelection ();
 }
 
 @Override
-void outlineViewSelectionIsChanging (long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void outlineViewSelectionIsChanging (long id, long sel, long notification) {
 	didSelect = true;
 	sendSelection ();
 }
 
 @Override
-void outlineView_setObjectValue_forTableColumn_byItem (long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ object, long /*int*/ tableColumn, long /*int*/ itemID) {
+void outlineView_setObjectValue_forTableColumn_byItem (long id, long sel, long outlineView, long object, long tableColumn, long itemID) {
 	if (checkColumn != null && tableColumn == checkColumn.id)  {
 		TreeItem item = (TreeItem) display.getWidget (itemID);
 		item.checked = !item.checked;
@@ -2441,7 +2441,7 @@ void outlineView_setObjectValue_forTableColumn_byItem (long /*int*/ id, long /*i
 }
 
 @Override
-boolean outlineView_writeItems_toPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
+boolean outlineView_writeItems_toPasteboard(long id, long sel, long arg0, long arg1, long arg2) {
 	return sendMouseEvent(NSApplication.sharedApplication().currentEvent(), SWT.DragDetect, true);
 }
 
@@ -2586,7 +2586,7 @@ void reskinChildren (int flags) {
 }
 
 @Override
-void setImage (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void setImage (long id, long sel, long arg0) {
 	OS.object_setInstanceVariable(id, Display.SWT_IMAGE, arg0);
 }
 
@@ -2662,7 +2662,7 @@ public void select (TreeItem item) {
 	checkItems ();
 	showItem (item);
 	NSOutlineView outlineView = (NSOutlineView) view;
-	long /*int*/ row = outlineView.rowForItem (item.handle);
+	long row = outlineView.rowForItem (item.handle);
 	NSIndexSet set = (NSIndexSet)new NSIndexSet().alloc();
 	set = set.initWithIndex(row);
 	ignoreSelect = true;
@@ -2672,7 +2672,7 @@ public void select (TreeItem item) {
 }
 
 @Override
-void selectRowIndexes_byExtendingSelection (long /*int*/ id, long /*int*/ sel, long /*int*/ indexes, boolean extend) {
+void selectRowIndexes_byExtendingSelection (long id, long sel, long indexes, boolean extend) {
 	if (preventSelect && !ignoreSelect) return;
 	if ((style & SWT.SINGLE) != 0 && !ignoreSelect) {
 		NSIndexSet set = new NSIndexSet(indexes);
@@ -2684,12 +2684,12 @@ void selectRowIndexes_byExtendingSelection (long /*int*/ id, long /*int*/ sel, l
 @Override
 void sendDoubleSelection() {
 	NSOutlineView outlineView = (NSOutlineView)view;
-	int rowIndex = (int)/*64*/outlineView.clickedRow ();
-	if (rowIndex == -1) rowIndex = (int)/*64*/outlineView.selectedRow ();
+	int rowIndex = (int)outlineView.clickedRow ();
+	if (rowIndex == -1) rowIndex = (int)outlineView.selectedRow ();
 	if (rowIndex != -1) {
 		if ((style & SWT.CHECK) != 0) {
 			NSArray columns = outlineView.tableColumns ();
-			int columnIndex = (int)/*64*/outlineView.clickedColumn ();
+			int columnIndex = (int)outlineView.clickedColumn ();
 			if (columnIndex != -1) {
 				id column = columns.objectAtIndex (columnIndex);
 				if (column.id == checkColumn.id) return;
@@ -2767,8 +2767,8 @@ boolean sendMouseEvent(NSEvent nsEvent, int type, boolean send) {
 		if (!dragDetected && selectedRowIndex != -1) {
 			NSOutlineView widget = (NSOutlineView)view;
 			NSIndexSet selectedRows = widget.selectedRowIndexes ();
-			int count = (int)/*64*/selectedRows.count();
-			long /*int*/ [] indexBuffer = new long /*int*/ [count];
+			int count = (int)selectedRows.count();
+			long [] indexBuffer = new long [count];
 			selectedRows.getIndexes(indexBuffer, count, 0);
 			for (int i = 0; i < count; i++) {
 				if (indexBuffer[i] == selectedRowIndex) continue;
@@ -2817,7 +2817,7 @@ void selectItems (TreeItem[] items, boolean ignoreDisposed) {
 }
 
 @Override
-NSRect titleRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
+NSRect titleRectForBounds (long id, long sel, NSRect cellFrame) {
 	NSImage image = new NSCell(id).image();
 	if (image != null) {
 		int imageWidth = imageBounds.width + IMAGE_GAP;
@@ -2938,7 +2938,7 @@ public void setHeaderBackground (Color color) {
 	if (color != null) {
 		if (color.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	}
-	double /*float*/ [] headerBackground = color != null ? color.handle : null;
+	double [] headerBackground = color != null ? color.handle : null;
 	if (equals (headerBackground, this.headerBackground)) return;
 	this.headerBackground = headerBackground;
 	if (getHeaderVisible()) {
@@ -2970,7 +2970,7 @@ public void setHeaderForeground (Color color) {
 	if (color != null) {
 		if (color.isDisposed ()) error (SWT.ERROR_INVALID_ARGUMENT);
 	}
-	double /*float*/ [] headerForeground = color != null ? color.handle : null;
+	double [] headerForeground = color != null ? color.handle : null;
 	if (equals (headerForeground, this.headerForeground)) return;
 	this.headerForeground = headerForeground;
 	if (getHeaderVisible()) {
@@ -3098,8 +3098,8 @@ void setItemCount (TreeItem parentItem, int count) {
 
 void setItemHeight (Image image, NSFont font, boolean set) {
 	if (font == null) font = getFont ().handle;
-	double /*float*/ ascent = font.ascender ();
-	double /*float*/ descent = -font.descender () + font.leading ();
+	double ascent = font.ascender ();
+	double descent = -font.descender () + font.leading ();
 	int height = (int)Math.ceil (ascent + descent) + 1;
 	Rectangle bounds = image != null ? image.getBounds () : imageBounds;
 	if (bounds != null) {
@@ -3185,12 +3185,12 @@ boolean setScrollWidth (TreeItem item) {
 }
 
 @Override
-void setShouldExpandItem (long /*int*/ id, long /*int*/ sel, boolean shouldExpand) {
+void setShouldExpandItem (long id, long sel, boolean shouldExpand) {
 	this.shouldExpand = shouldExpand;
 }
 
 @Override
-void setShouldScrollClipView (long /*int*/ id, long /*int*/ sel, boolean shouldScroll) {
+void setShouldScrollClipView (long id, long sel, boolean shouldScroll) {
 	this.shouldScroll = shouldScroll;
 }
 
@@ -3352,7 +3352,7 @@ public void setTopItem (TreeItem item) {
 	checkItems ();
 	showItem (item, false);
 	NSOutlineView widget = (NSOutlineView) view;
-	long /*int*/ row = widget.rowForItem (item.handle);
+	long row = widget.rowForItem (item.handle);
 	if (row == -1) return;
 	NSPoint pt = new NSPoint();
 	pt.x = scrollView.contentView().bounds().x;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java
index 9996ae638f..a8f2cfd3db 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java
@@ -209,7 +209,7 @@ void destroyWidget () {
 }
 
 @Override
-void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellRect, long /*int*/ view) {
+void drawInteriorWithFrame_inView (long id, long sel, NSRect cellRect, long view) {
 	/*
 	 * Feature in Cocoa.  When the last column in a tree does not reach the
 	 * rightmost edge of the tree view, the cell that draws the rightmost-
@@ -224,7 +224,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cel
 		if (parent.headerBackground != null) {
 			NSGraphicsContext context = NSGraphicsContext.currentContext ();
 			context.saveGraphicsState ();
-			double /*float*/ [] colorRGB = parent.headerBackground;
+			double [] colorRGB = parent.headerBackground;
 			NSColor color = NSColor.colorWithDeviceRed(colorRGB[0], colorRGB[1], colorRGB[2], 1f);
 			color.setFill();
 			/*
@@ -263,7 +263,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cel
 	if (parent.headerBackground != null) {
 		// fill header background
 		context.saveGraphicsState();
-		double /*float*/ [] colorRGB = parent.headerBackground;
+		double [] colorRGB = parent.headerBackground;
 		NSColor color1 = NSColor.colorWithDeviceRed(colorRGB[0], colorRGB[1], colorRGB[2], 1f);
 		color1.setFill();
 		/*
@@ -308,7 +308,7 @@ void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cel
 			NSRect sortIndicatorRect = headerCell.sortIndicatorRectForBounds(cellRect);
 			context.saveGraphicsState();
 			if(parent.headerForeground != null) {
-				double /*float*/ [] colorRGB = parent.headerForeground;
+				double [] colorRGB = parent.headerForeground;
 				NSColor color = NSColor.colorWithDeviceRed(colorRGB[0], colorRGB[1], colorRGB[2], 0.9f);
 				color.setStroke();
 			}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java
index 1e402b4004..107e610b11 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java
@@ -382,7 +382,7 @@ NSObject createString(int index) {
 }
 
 @Override
-void dealloc (long /*int*/ id, long /*int*/ sel) {
+void dealloc (long id, long sel) {
 	OS.object_setInstanceVariable(id, Display.SWT_OBJECT, 0);
 	super.destroyJNIRef();
 	super.dealloc(id, sel);
@@ -464,7 +464,7 @@ public Rectangle getBounds () {
 	parent.checkItems ();
 
 	NSOutlineView widget = (NSOutlineView) parent.view;
-	int rowIndex = (int)/*64*/widget.rowForItem (handle);
+	int rowIndex = (int)widget.rowForItem (handle);
 	if (rowIndex == -1) return new Rectangle (0, 0, 0, 0);
 
 	NSTableColumn column = parent.columnCount == 0 ? parent.firstColumn : parent.columns [0].nsColumn;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
index c3f33c2d20..96c6cb4f5b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
@@ -51,7 +51,7 @@ public abstract class Widget {
 	EventTable eventTable;
 	Object data;
 
-	long /*int*/ jniRef;
+	long jniRef;
 
 	/* Global state flags */
 	static final int DISPOSED         = 1 << 0;
@@ -145,61 +145,61 @@ public Widget (Widget parent, int style) {
 	reskinWidget ();
 }
 
-long /*int*/ accessibleHandle() {
+long accessibleHandle() {
 	return 0;
 }
 
-long /*int*/ accessibilityActionDescription(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+long accessibilityActionDescription(long id, long sel, long arg0) {
 	return callSuperObject(id, sel, arg0);
 }
 
-long /*int*/ accessibilityActionNames(long /*int*/ id, long /*int*/ sel) {
+long accessibilityActionNames(long id, long sel) {
 	return callSuperObject(id, sel);
 }
 
-long /*int*/ accessibilityAttributeNames(long /*int*/ id, long /*int*/ sel) {
+long accessibilityAttributeNames(long id, long sel) {
 	return callSuperObject(id, sel);
 }
 
-long /*int*/ accessibilityAttributeValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+long accessibilityAttributeValue(long id, long sel, long arg0) {
 	return callSuperObject(id, sel, arg0);
 }
 
-long /*int*/ accessibilityAttributeValue_forParameter(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+long accessibilityAttributeValue_forParameter(long id, long sel, long arg0, long arg1) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel, arg0, arg1);
 }
 
-long /*int*/ accessibilityFocusedUIElement(long /*int*/ id, long /*int*/ sel) {
+long accessibilityFocusedUIElement(long id, long sel) {
 	return callSuperObject(id, sel);
 }
 
-long /*int*/ accessibilityHitTest(long /*int*/ id, long /*int*/ sel, NSPoint point) {
+long accessibilityHitTest(long id, long sel, NSPoint point) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel, point);
 }
 
-boolean accessibilityIsAttributeSettable(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+boolean accessibilityIsAttributeSettable(long id, long sel, long arg0) {
 	return callSuperBoolean(id, sel, arg0);
 }
 
-boolean accessibilityIsIgnored(long /*int*/ id, long /*int*/ sel) {
+boolean accessibilityIsIgnored(long id, long sel) {
 	return callSuperBoolean(id, sel);
 }
 
-long /*int*/ accessibilityParameterizedAttributeNames(long /*int*/ id, long /*int*/ sel) {
+long accessibilityParameterizedAttributeNames(long id, long sel) {
 	return callSuperObject(id, sel);
 }
 
-void accessibilityPerformAction(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void accessibilityPerformAction(long id, long sel, long arg0) {
 	callSuper(id, sel, arg0);
 }
 
-void accessibilitySetValue_forAttribute(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+void accessibilitySetValue_forAttribute(long id, long sel, long arg0, long arg1) {
 	callSuper(id, sel, arg0, arg1);
 }
 
@@ -213,7 +213,7 @@ String getClipboardText () {
 void setClipRegion (NSView view) {
 }
 
-long /*int*/ attributedSubstringFromRange (long /*int*/ id, long /*int*/ sel, long /*int*/ range) {
+long attributedSubstringFromRange (long id, long sel, long range) {
 	return 0;
 }
 
@@ -221,67 +221,67 @@ void cacheDisplayInRect_toBitmapImageRep (long id, long sel, NSRect rect, long i
 	callSuper(id, sel, rect, imageRep);
 }
 
-void callSuper(long /*int*/ id, long /*int*/ sel) {
+void callSuper(long id, long sel) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel);
 }
 
-void callSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void callSuper(long id, long sel, long arg0) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, arg0);
 }
 
-void callSuper(long /*int*/ id, long /*int*/ sel, NSRect arg0) {
+void callSuper(long id, long sel, NSRect arg0) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, arg0);
 }
 
-void callSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+void callSuper(long id, long sel, long arg0, long arg1) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, arg0, arg1);
 }
 
-void callSuper(long /*int*/ id, long /*int*/ sel, NSRect arg0, long /*int*/ arg1) {
+void callSuper(long id, long sel, NSRect arg0, long arg1) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, arg0, arg1);
 }
 
-long /*int*/ callSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, NSRect arg1, long /*int*/ arg2) {
+long callSuper(long id, long sel, long arg0, NSRect arg1, long arg2) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel, arg0, arg1, arg2);
 }
 
-boolean callSuperBoolean(long /*int*/ id, long /*int*/ sel) {
+boolean callSuperBoolean(long id, long sel) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel) != 0;
 }
 
-boolean canBecomeKeyWindow (long /*int*/ id, long /*int*/ sel) {
+boolean canBecomeKeyWindow (long id, long sel) {
 	return callSuperBoolean (id, sel);
 }
 
-boolean needsPanelToBecomeKey (long /*int*/ id, long /*int*/ sel) {
+boolean needsPanelToBecomeKey (long id, long sel) {
 	return callSuperBoolean (id, sel);
 }
 
-void cancelOperation(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void cancelOperation(long id, long sel, long arg0) {
 }
 
-NSSize cellSize (long /*int*/ id, long /*int*/ sel) {
+NSSize cellSize (long id, long sel) {
 	NSSize result = new NSSize();
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
@@ -290,7 +290,7 @@ NSSize cellSize (long /*int*/ id, long /*int*/ sel) {
 	return result;
 }
 
-NSSize cellSizeForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
+NSSize cellSizeForBounds (long id, long sel, NSRect cellFrame) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -299,42 +299,42 @@ NSSize cellSizeForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
 	return result;
 }
 
-boolean callSuperBoolean(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+boolean callSuperBoolean(long id, long sel, long arg0) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel, arg0) != 0;
 }
 
-boolean callSuperBoolean(long /*int*/ id, long /*int*/ sel, NSRange range, long /*int*/ arg1) {
+boolean callSuperBoolean(long id, long sel, NSRange range, long arg1) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper_bool(super_struct, sel, range, arg1);
 }
 
-long /*int*/ callSuperObject(long /*int*/ id, long /*int*/ sel) {
+long callSuperObject(long id, long sel) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel);
 }
 
-long /*int*/ callSuperObject(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+long callSuperObject(long id, long sel, long arg0) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel, arg0);
 }
 
-long /*int*/ callSuperObject(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+long callSuperObject(long id, long sel, long arg0, long arg1) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel, arg0, arg1);
 }
 
-NSRect callSuperRect(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+NSRect callSuperRect(long id, long sel, long arg0) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -343,7 +343,7 @@ NSRect callSuperRect(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
 	return result;
 }
 
-NSRect callSuperRect(long /*int*/ id, long /*int*/ sel, NSRect rect, long /*int*/ arg0) {
+NSRect callSuperRect(long id, long sel, NSRect rect, long arg0) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -352,40 +352,40 @@ NSRect callSuperRect(long /*int*/ id, long /*int*/ sel, NSRect rect, long /*int*
 	return result;
 }
 
-boolean canDragRowsWithIndexes_atPoint(long /*int*/ id, long /*int*/ sel, long /*int*/ rowIndexes, NSPoint mouseDownPoint) {
+boolean canDragRowsWithIndexes_atPoint(long id, long sel, long rowIndexes, NSPoint mouseDownPoint) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper_bool(super_struct, sel, rowIndexes, mouseDownPoint);
 }
 
-long /*int*/ characterIndexForPoint (long /*int*/ id, long /*int*/ sel, long /*int*/ point) {
+long characterIndexForPoint (long id, long sel, long point) {
 	return OS.NSNotFound();
 }
 
-long /*int*/ columnAtPoint(long /*int*/ id, long /*int*/ sel, NSPoint point) {
+long columnAtPoint(long id, long sel, NSPoint point) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel, point);
 }
 
-boolean acceptsFirstMouse (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+boolean acceptsFirstMouse (long id, long sel, long theEvent) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel, theEvent) != 0;
 }
 
-boolean acceptsFirstResponder (long /*int*/ id, long /*int*/ sel) {
+boolean acceptsFirstResponder (long id, long sel) {
 	return callSuperBoolean(id, sel);
 }
 
-boolean becomeFirstResponder (long /*int*/ id, long /*int*/ sel) {
+boolean becomeFirstResponder (long id, long sel) {
 	return callSuperBoolean(id, sel);
 }
 
-void becomeKeyWindow (long /*int*/ id, long /*int*/ sel) {
+void becomeKeyWindow (long id, long sel) {
 	callSuper(id, sel);
 }
 
@@ -433,7 +433,7 @@ void reskinWidget() {
 	}
 }
 
-boolean resignFirstResponder (long /*int*/ id, long /*int*/ sel) {
+boolean resignFirstResponder (long id, long sel) {
 	return callSuperBoolean(id, sel);
 }
 
@@ -498,7 +498,7 @@ public void addDisposeListener (DisposeListener listener) {
 	addListener (SWT.Dispose, typedListener);
 }
 
-boolean canBecomeKeyView(long /*int*/ id, long /*int*/ sel) {
+boolean canBecomeKeyView(long id, long sel) {
 	return true;
 }
 
@@ -598,14 +598,14 @@ protected void checkWidget () {
 	if ((state & DISPOSED) != 0) error (SWT.ERROR_WIDGET_DISPOSED);
 }
 
-void clearDeferFlushing (long /*int*/ id, long /*int*/ sel) {
+void clearDeferFlushing (long id, long sel) {
 }
 
-boolean textView_clickOnLink_atIndex(long /*int*/ id, long /*int*/ sel, long /*int*/ textView, long /*int*/ link, long /*int*/ charIndex) {
+boolean textView_clickOnLink_atIndex(long id, long sel, long textView, long link, long charIndex) {
 	return true;
 }
 
-void collapseItem_collapseChildren (long /*int*/ id, long /*int*/ sel, long /*int*/ item, boolean children) {
+void collapseItem_collapseChildren (long id, long sel, long item, boolean children) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -635,16 +635,16 @@ void createWidget () {
 	register ();
 }
 
-void comboBoxSelectionDidChange(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void comboBoxSelectionDidChange(long id, long sel, long notification) {
 }
 
-void comboBoxWillDismiss(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void comboBoxWillDismiss(long id, long sel, long notification) {
 }
 
-void comboBoxWillPopUp(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void comboBoxWillPopUp(long id, long sel, long notification) {
 }
 
-void dealloc (long /*int*/id, long /*int*/sel) {
+void dealloc (long id, long sel) {
 	callSuper (id, sel);
 }
 
@@ -694,35 +694,35 @@ public void dispose () {
 	release (true);
 }
 
-void deselectAll(long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
+void deselectAll(long id, long sel, long sender) {
 	callSuper(id, sel, sender);
 }
 
-void deselectRow(long /*int*/ id, long /*int*/ sel, long /*int*/ index) {
+void deselectRow(long id, long sel, long index) {
 	callSuper(id, sel, index);
 }
 
-void doCommandBySelector (long /*int*/ id, long /*int*/ sel, long /*int*/ aSelector) {
+void doCommandBySelector (long id, long sel, long aSelector) {
 	callSuper (id, sel, aSelector);
 }
 
-boolean dragSelectionWithEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
+boolean dragSelectionWithEvent(long id, long sel, long arg0, long arg1, long arg2) {
 	return false;
 }
 
-void drawBackground (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawBackground (long id, NSGraphicsContext context, NSRect rect) {
 	/* Do nothing */
 }
 
-void drawBackgroundInClipRect(long /*int*/ id, long /*int*/ sel, NSRect rect) {
+void drawBackgroundInClipRect(long id, long sel, NSRect rect) {
 	callSuper(id, sel, rect);
 }
 
-void drawImageWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ image, NSRect rect, long /*int*/ view) {
+void drawImageWithFrameInView (long id, long sel, long image, NSRect rect, long view) {
 	callSuper(id, sel, image, rect, view);
 }
 
-NSRect drawTitleWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/ title, NSRect rect, long /*int*/ view) {
+NSRect drawTitleWithFrameInView (long id, long sel, long title, NSRect rect, long view) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -731,30 +731,30 @@ NSRect drawTitleWithFrameInView (long /*int*/ id, long /*int*/ sel, long /*int*/
 	return result;
 }
 
-void drawInteriorWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ view) {
+void drawInteriorWithFrame_inView (long id, long sel, NSRect cellFrame, long view) {
 	callSuper(id, sel, cellFrame, view);
 }
 
-void drawBezelWithFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ view) {
+void drawBezelWithFrame_inView (long id, long sel, NSRect cellFrame, long view) {
 	callSuper(id, sel, cellFrame, view);
 }
 
-void drawLabelInRect(long /*int*/ id, long /*int*/ sel, boolean shouldTruncateLabel, NSRect rect) {
+void drawLabelInRect(long id, long sel, boolean shouldTruncateLabel, NSRect rect) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, shouldTruncateLabel, rect);
 }
 
-void drawViewBackgroundInRect(long /*int*/ id, long /*int*/ sel, NSRect rect) {
+void drawViewBackgroundInRect(long id, long sel, NSRect rect) {
 	callSuper(id, sel, rect);
 }
 
-void drawWithExpansionFrame_inView (long /*int*/ id, long /*int*/ sel, NSRect cellFrame, long /*int*/ view) {
+void drawWithExpansionFrame_inView (long id, long sel, NSRect cellFrame, long view) {
 	callSuper(id, sel, cellFrame, view);
 }
 
-void drawRect (long /*int*/ id, long /*int*/ sel, NSRect rect) {
+void drawRect (long id, long sel, NSRect rect) {
 	if (!isDrawing()) return;
 	Display display = this.display;
 	NSView view = new NSView(id);
@@ -779,17 +779,17 @@ void drawRect (long /*int*/ id, long /*int*/ sel, NSRect rect) {
 	display.isPainting.removeObjectIdenticalTo(view);
 }
 
-void _drawThemeProgressArea (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void _drawThemeProgressArea (long id, long sel, long arg0) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, arg0);
 }
 
-void drawWidget (long /*int*/ id, NSGraphicsContext context, NSRect rect) {
+void drawWidget (long id, NSGraphicsContext context, NSRect rect) {
 }
 
-long /*int*/ imageView () {
+long imageView () {
 	return 0;
 }
 
@@ -797,7 +797,7 @@ void redrawWidget (NSView view, boolean children) {
 	view.setNeedsDisplay(true);
 }
 
-void redrawWidget (NSView view, long /*int*/ x, long /*int*/ y, long /*int*/ width, long /*int*/ height, boolean children) {
+void redrawWidget (NSView view, long x, long y, long width, long height, boolean children) {
 	NSRect rect = new NSRect();
 	rect.x = x;
 	rect.y = y;
@@ -810,14 +810,14 @@ void error (int code) {
 	SWT.error(code);
 }
 
-void expandItem_expandChildren (long /*int*/ id, long /*int*/ sel, long /*int*/ item, boolean children) {
+void expandItem_expandChildren (long id, long sel, long item, boolean children) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, item, children);
 }
 
-NSRect expansionFrameWithFrame_inView(long /*int*/ id, long /*int*/ sel, NSRect cellRect, long /*int*/ view) {
+NSRect expansionFrameWithFrame_inView(long id, long sel, NSRect cellRect, long view) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -830,7 +830,7 @@ boolean filters (int eventType) {
 	return display.filters (eventType);
 }
 
-NSRect firstRectForCharacterRange(long /*int*/ id, long /*int*/ sel, long /*int*/ range) {
+NSRect firstRectForCharacterRange(long id, long sel, long range) {
 	return new NSRect ();
 }
 
@@ -846,7 +846,7 @@ int fixMnemonic (char [] buffer) {
 	return j;
 }
 
-NSRect focusRingMaskBoundsForFrame(long /*int*/ id, long /*int*/ sel, NSRect cellFrame,  long /*int*/ view) {
+NSRect focusRingMaskBoundsForFrame(long id, long sel, NSRect cellFrame,  long view) {
 	return callSuperRect(id, sel, cellFrame, view);
 }
 
@@ -1002,28 +1002,28 @@ public int getStyle () {
 	return style;
 }
 
-boolean hasMarkedText (long /*int*/ id, long /*int*/ sel) {
+boolean hasMarkedText (long id, long sel) {
 	return false;
 }
 
-NSRect headerRectOfColumn (long /*int*/ id, long /*int*/ sel, long /*int*/ column) {
+NSRect headerRectOfColumn (long id, long sel, long column) {
 	return callSuperRect(id, sel, column);
 }
 
-void helpRequested(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void helpRequested(long id, long sel, long theEvent) {
 }
 
-void highlightSelectionInClipRect(long /*int*/ id, long /*int*/ sel, long /*int*/ rect) {
+void highlightSelectionInClipRect(long id, long sel, long rect) {
 }
 
-long /*int*/ hitTest (long /*int*/ id, long /*int*/ sel, NSPoint point) {
+long hitTest (long id, long sel, NSPoint point) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel, point);
 }
 
-long /*int*/ hitTestForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event, NSRect rect, long /*int*/ controlView) {
+long hitTestForEvent (long id, long sel, long event, NSRect rect, long controlView) {
 	return 0;
 }
 
@@ -1032,15 +1032,15 @@ boolean hooks (int eventType) {
 	return eventTable.hooks (eventType);
 }
 
-long /*int*/ image (long /*int*/ id, long /*int*/ sel) {
+long image (long id, long sel) {
 	return 0;
 }
 
-NSRect imageRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
+NSRect imageRectForBounds (long id, long sel, NSRect cellFrame) {
 	return new NSRect();
 }
 
-boolean insertText (long /*int*/ id, long /*int*/ sel, long /*int*/ string) {
+boolean insertText (long id, long sel, long string) {
 	callSuper (id, sel, string);
 	return true;
 }
@@ -1082,7 +1082,7 @@ boolean isDrawing () {
 	return true;
 }
 
-boolean isFlipped(long /*int*/ id, long /*int*/ sel) {
+boolean isFlipped(long id, long sel) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -1110,7 +1110,7 @@ public boolean isListening (int eventType) {
 	return hooks (eventType);
 }
 
-boolean isOpaque(long /*int*/ id, long /*int*/ sel) {
+boolean isOpaque(long id, long sel) {
 	return false;
 }
 
@@ -1122,178 +1122,178 @@ boolean isValidThread () {
 	return getDisplay ().isValidThread ();
 }
 
-void flagsChanged (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void flagsChanged (long id, long sel, long theEvent) {
 	callSuper (id, sel, theEvent);
 }
 
-void keyDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void keyDown (long id, long sel, long theEvent) {
 	superKeyDown(id, sel, theEvent);
 }
 
-void keyUp (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void keyUp (long id, long sel, long theEvent) {
 	superKeyUp(id, sel, theEvent);
 }
 
-void mouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDown(long id, long sel, long theEvent) {
 	mouseDownSuper(id, sel, theEvent);
 }
 
-boolean mouseDownCanMoveWindow(long /*int*/ id, long /*int*/ sel) {
+boolean mouseDownCanMoveWindow(long id, long sel) {
 	return callSuperBoolean(id, sel);
 }
 
-void mouseDownSuper(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDownSuper(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-void mouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseUp(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-void mouseMoved(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseMoved(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-void mouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseDragged(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-void mouseEntered(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseEntered(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-void mouseExited(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void mouseExited(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-void cursorUpdate(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void cursorUpdate(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-void rightMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void rightMouseDown(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-void rightMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void rightMouseUp(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-void rightMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void rightMouseDragged(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-void otherMouseDown(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void otherMouseDown(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-void otherMouseUp(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void otherMouseUp(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-void otherMouseDragged(long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void otherMouseDragged(long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-boolean shouldDelayWindowOrderingForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+boolean shouldDelayWindowOrderingForEvent (long id, long sel, long theEvent) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel, theEvent) != 0;
 }
 
-boolean menuHasKeyEquivalent_forEvent_target_action(long /*int*/ id, long /*int*/ sel, long /*int*/ menu, long /*int*/ event, long /*int*/ target, long /*int*/ action) {
+boolean menuHasKeyEquivalent_forEvent_target_action(long id, long sel, long menu, long event, long target, long action) {
 	return true;
 }
 
-long /*int*/ menuForEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+long menuForEvent (long id, long sel, long theEvent) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	return OS.objc_msgSendSuper(super_struct, sel, theEvent);
 }
 
-void menuNeedsUpdate(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
+void menuNeedsUpdate(long id, long sel, long menu) {
 }
 
-boolean makeFirstResponder(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+boolean makeFirstResponder(long id, long sel, long notification) {
 	return callSuperBoolean(id, sel, notification);
 }
 
-NSRange markedRange (long /*int*/ id, long /*int*/ sel) {
+NSRange markedRange (long id, long sel) {
 	return new NSRange ();
 }
 
-void menu_willHighlightItem(long /*int*/ id, long /*int*/ sel, long /*int*/ menu, long /*int*/ item) {
+void menu_willHighlightItem(long id, long sel, long menu, long item) {
 }
 
-void menuDidClose(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
+void menuDidClose(long id, long sel, long menu) {
 }
 
-void menuWillOpen(long /*int*/ id, long /*int*/ sel, long /*int*/ menu) {
+void menuWillOpen(long id, long sel, long menu) {
 }
 
-void noResponderFor(long /*int*/ id, long /*int*/ sel, long /*int*/ selector) {
+void noResponderFor(long id, long sel, long selector) {
 	callSuper(id, sel, selector);
 }
 
-long /*int*/ numberOfRowsInTableView(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView) {
+long numberOfRowsInTableView(long id, long sel, long aTableView) {
 	return 0;
 }
 
-long /*int*/ outlineView_child_ofItem(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ index, long /*int*/ item) {
+long outlineView_child_ofItem(long id, long sel, long outlineView, long index, long item) {
 	return 0;
 }
 
-void outlineView_didClickTableColumn(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ tableColumn) {
+void outlineView_didClickTableColumn(long id, long sel, long outlineView, long tableColumn) {
 }
 
-long /*int*/ outlineView_objectValueForTableColumn_byItem(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ tableColumn, long /*int*/ item) {
+long outlineView_objectValueForTableColumn_byItem(long id, long sel, long outlineView, long tableColumn, long item) {
 	return 0;
 }
 
-boolean outlineView_isItemExpandable(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ item) {
+boolean outlineView_isItemExpandable(long id, long sel, long outlineView, long item) {
 	return false;
 }
 
-long /*int*/ outlineView_numberOfChildrenOfItem(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ item) {
+long outlineView_numberOfChildrenOfItem(long id, long sel, long outlineView, long item) {
 	return 0;
 }
 
-boolean outlineView_shouldExpandItem_item(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ item) {
+boolean outlineView_shouldExpandItem_item(long id, long sel, long outlineView, long item) {
 	return true;
 }
 
-boolean outlineView_shouldReorderColumn_toColumn(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ columnIndex, long /*int*/ newColumnIndex) {
+boolean outlineView_shouldReorderColumn_toColumn(long id, long sel, long aTableView, long columnIndex, long newColumnIndex) {
 	return true;
 }
 
-boolean outlineView_shouldEditTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ aTableColumn, long /*int*/ item) {
+boolean outlineView_shouldEditTableColumn_row(long id, long sel, long aTableView, long aTableColumn, long item) {
 	return false;
 }
 
-boolean outlineView_shouldTrackCell_forTableColumn_item(long /*int*/ id, long /*int*/ sel, long /*int*/ table, long /*int*/ cell, long /*int*/ tableColumn, long /*int*/ item) {
+boolean outlineView_shouldTrackCell_forTableColumn_item(long id, long sel, long table, long cell, long tableColumn, long item) {
 	return true;
 }
 
-void outlineView_willDisplayCell_forTableColumn_item(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ cell, long /*int*/ tableColumn, long /*int*/ item) {
+void outlineView_willDisplayCell_forTableColumn_item(long id, long sel, long outlineView, long cell, long tableColumn, long item) {
 }
 
-void outlineViewColumnDidMove (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void outlineViewColumnDidMove (long id, long sel, long aNotification) {
 }
 
-void outlineViewColumnDidResize (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void outlineViewColumnDidResize (long id, long sel, long aNotification) {
 }
 
-void outlineViewSelectionDidChange(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void outlineViewSelectionDidChange(long id, long sel, long notification) {
 }
 
-void outlineViewSelectionIsChanging(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void outlineViewSelectionIsChanging(long id, long sel, long notification) {
 }
 
-void outlineView_setObjectValue_forTableColumn_byItem(long /*int*/ id, long /*int*/ sel, long /*int*/ outlineView, long /*int*/ object, long /*int*/ tableColumn, long /*int*/ item) {
+void outlineView_setObjectValue_forTableColumn_byItem(long id, long sel, long outlineView, long object, long tableColumn, long item) {
 }
 
-boolean outlineView_writeItems_toPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
+boolean outlineView_writeItems_toPasteboard(long id, long sel, long arg0, long arg1, long arg2) {
 	return false;
 }
 
@@ -1324,11 +1324,11 @@ public void notifyListeners (int eventType, Event event) {
 	sendEvent (eventType, event);
 }
 
-void pageDown (long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
+void pageDown (long id, long sel, long sender) {
 	callSuper(id, sel, sender);
 }
 
-void pageUp (long /*int*/ id, long /*int*/ sel, long /*int*/ sender) {
+void pageUp (long id, long sel, long sender) {
 	callSuper(id, sel, sender);
 }
 
@@ -1340,7 +1340,7 @@ void postEvent (int eventType, Event event) {
 	sendEvent (eventType, event, false);
 }
 
-void reflectScrolledClipView (long /*int*/ id, long /*int*/ sel, long /*int*/ aClipView) {
+void reflectScrolledClipView (long id, long sel, long aClipView) {
 	callSuper (id, sel, aClipView);
 }
 
@@ -1475,33 +1475,33 @@ public void removeDisposeListener (DisposeListener listener) {
 	eventTable.unhook (SWT.Dispose, listener);
 }
 
-void scrollClipViewToPoint (long /*int*/ id, long /*int*/ sel, long /*int*/ clipView, NSPoint point) {
+void scrollClipViewToPoint (long id, long sel, long clipView, NSPoint point) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, clipView, point);
 }
 
-void selectRowIndexes_byExtendingSelection (long /*int*/ id, long /*int*/ sel, long /*int*/ indexes, boolean extend) {
+void selectRowIndexes_byExtendingSelection (long id, long sel, long indexes, boolean extend) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, indexes, extend);
 }
 
-void scrollWheel (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void scrollWheel (long id, long sel, long theEvent) {
 	callSuper(id, sel, theEvent);
 }
 
-NSRange selectedRange (long /*int*/ id, long /*int*/ sel) {
+NSRange selectedRange (long id, long sel) {
 	return new NSRange ();
 }
 
-long /*int*/ nextValidKeyView (long /*int*/ id, long /*int*/ sel) {
+long nextValidKeyView (long id, long sel) {
 	return callSuperObject(id, sel);
 }
 
-long /*int*/ previousValidKeyView (long /*int*/ id, long /*int*/ sel) {
+long previousValidKeyView (long id, long sel) {
 	return callSuperObject(id, sel);
 }
 
@@ -1710,21 +1710,21 @@ void setOpenGLContext(Object value) {
 void setOrientation () {
 }
 
-void setFrameOrigin (long /*int*/ id, long /*int*/ sel, NSPoint point) {
+void setFrameOrigin (long id, long sel, NSPoint point) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, point);
 }
 
-void setFrameSize (long /*int*/ id, long /*int*/ sel, NSSize size) {
+void setFrameSize (long id, long sel, NSSize size) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
 	OS.objc_msgSendSuper(super_struct, sel, size);
 }
 
-void setImage (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void setImage (long id, long sel, long arg0) {
 }
 
 boolean setInputState (Event event, NSEvent nsEvent, int type) {
@@ -1732,7 +1732,7 @@ boolean setInputState (Event event, NSEvent nsEvent, int type) {
 		nsEvent = NSApplication.sharedApplication().currentEvent();
 		if (nsEvent == null) return true;
 	}
-	long /*int*/ modifierFlags = nsEvent.modifierFlags();
+	long modifierFlags = nsEvent.modifierFlags();
 	if ((modifierFlags & OS.NSAlternateKeyMask) != 0) event.stateMask |= SWT.ALT;
 	if ((modifierFlags & OS.NSShiftKeyMask) != 0) event.stateMask |= SWT.SHIFT;
 	if ((modifierFlags & OS.NSControlKeyMask) != 0) event.stateMask |= SWT.CONTROL;
@@ -1805,15 +1805,15 @@ boolean setKeyState (Event event, int type, NSEvent nsEvent) {
 				if (chars != null && chars.length() > 0) event.character = (char)chars.characterAtIndex (0);
 			}
 			if (event.keyCode == 0) {
-				long /*int*/ uchrPtr = 0;
-				long /*int*/ currentKbd = OS.TISCopyCurrentKeyboardInputSource();
-				long /*int*/ uchrCFData = OS.TISGetInputSourceProperty(currentKbd, OS.kTISPropertyUnicodeKeyLayoutData());
+				long uchrPtr = 0;
+				long currentKbd = OS.TISCopyCurrentKeyboardInputSource();
+				long uchrCFData = OS.TISGetInputSourceProperty(currentKbd, OS.kTISPropertyUnicodeKeyLayoutData());
 
 				if (uchrCFData != 0) {
 					uchrPtr = OS.CFDataGetBytePtr(uchrCFData);
 
 					if (uchrPtr != 0 && OS.CFDataGetLength(uchrCFData) > 0) {
-						long /*int*/ cgEvent = nsEvent.CGEvent();
+						long cgEvent = nsEvent.CGEvent();
 						long keyboardType = OS.CGEventGetIntegerValueField(cgEvent, OS.kCGKeyboardEventKeyboardType);
 
 						int maxStringLength = 256;
@@ -1882,11 +1882,11 @@ void setLocationMask (Event event, NSEvent nsEvent) {
 	}
 }
 
-boolean setMarkedText_selectedRange (long /*int*/ id, long /*int*/ sel, long /*int*/ string, long /*int*/ range) {
+boolean setMarkedText_selectedRange (long id, long sel, long string, long range) {
 	return true;
 }
 
-void setNeedsDisplay (long /*int*/ id, long /*int*/ sel, boolean flag) {
+void setNeedsDisplay (long id, long sel, boolean flag) {
 	if (flag && !isDrawing()) return;
 	NSView view = new NSView(id);
 	if (flag && display.isPainting.containsObject(view)) {
@@ -1904,7 +1904,7 @@ void setNeedsDisplay (long /*int*/ id, long /*int*/ sel, boolean flag) {
 	OS.objc_msgSendSuper(super_struct, sel, flag);
 }
 
-void setNeedsDisplayInRect (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void setNeedsDisplayInRect (long id, long sel, long arg0) {
 	if (!isDrawing()) return;
 	NSRect rect = new NSRect();
 	OS.memmove(rect, arg0, NSRect.sizeof);
@@ -1925,14 +1925,14 @@ void setNeedsDisplayInRect (long /*int*/ id, long /*int*/ sel, long /*int*/ arg0
 	OS.objc_msgSendSuper(super_struct, sel, rect);
 }
 
-void setObjectValue(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void setObjectValue(long id, long sel, long arg0) {
 	callSuper(id, sel, arg0);
 }
 
-void setShouldExpandItem(long /*int*/ id, long /*int*/ sel, boolean shouldExpand) {
+void setShouldExpandItem(long id, long sel, boolean shouldExpand) {
 }
 
-void setShouldScrollClipView(long /*int*/ id, long /*int*/ sel, boolean shouldScroll) {
+void setShouldScrollClipView(long id, long sel, boolean shouldScroll) {
 }
 
 boolean setTabGroupFocus () {
@@ -1943,11 +1943,11 @@ boolean setTabItemFocus () {
 	return false;
 }
 
-boolean shouldChangeTextInRange_replacementString(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1) {
+boolean shouldChangeTextInRange_replacementString(long id, long sel, long arg0, long arg1) {
 	return true;
 }
 
-NSSize sizeOfLabel(long /*int*/ id, long /*int*/ sel, boolean shouldTruncateLabel) {
+NSSize sizeOfLabel(long id, long sel, boolean shouldTruncateLabel) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -1956,71 +1956,71 @@ NSSize sizeOfLabel(long /*int*/ id, long /*int*/ sel, boolean shouldTruncateLabe
 	return result;
 }
 
-void superKeyDown (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void superKeyDown (long id, long sel, long theEvent) {
 	callSuper (id, sel, theEvent);
 }
 
-void superKeyUp (long /*int*/ id, long /*int*/ sel, long /*int*/ theEvent) {
+void superKeyUp (long id, long sel, long theEvent) {
 	callSuper (id, sel, theEvent);
 }
 
-void tableViewColumnDidMove (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void tableViewColumnDidMove (long id, long sel, long aNotification) {
 }
 
-void tableViewColumnDidResize (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void tableViewColumnDidResize (long id, long sel, long aNotification) {
 }
 
-void tableViewSelectionDidChange (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void tableViewSelectionDidChange (long id, long sel, long aNotification) {
 }
 
-void tableViewSelectionIsChanging (long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void tableViewSelectionIsChanging (long id, long sel, long aNotification) {
 }
 
-void tableView_didClickTableColumn(long /*int*/ id, long /*int*/ sel, long /*int*/ tableView, long /*int*/ tableColumn) {
+void tableView_didClickTableColumn(long id, long sel, long tableView, long tableColumn) {
 }
 
-long /*int*/ tableView_objectValueForTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
+long tableView_objectValueForTableColumn_row(long id, long sel, long aTableView, long aTableColumn, long rowIndex) {
 	return 0;
 }
 
-boolean tableView_shouldSelectRow(long /*int*/ id, long /*int*/ sel, long /*int*/ tableView, long /*int*/ index) {
+boolean tableView_shouldSelectRow(long id, long sel, long tableView, long index) {
 	return true;
 }
 
-void tableView_setObjectValue_forTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ anObject, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
+void tableView_setObjectValue_forTableColumn_row(long id, long sel, long aTableView, long anObject, long aTableColumn, long rowIndex) {
 }
 
-boolean tableView_shouldReorderColumn_toColumn(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ columnIndex, long /*int*/ newColumnIndex) {
+boolean tableView_shouldReorderColumn_toColumn(long id, long sel, long aTableView, long columnIndex, long newColumnIndex) {
 	return true;
 }
 
-boolean tableView_shouldEditTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
+boolean tableView_shouldEditTableColumn_row(long id, long sel, long aTableView, long aTableColumn, long rowIndex) {
 	return false;
 }
 
-boolean tableView_shouldTrackCell_forTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ table, long /*int*/ cell, /*long*/ long /*int*/ tableColumn, long /*int*/ rowIndex) {
+boolean tableView_shouldTrackCell_forTableColumn_row(long id, long sel, long table, long cell, /*long*/ long tableColumn, long rowIndex) {
 	return true;
 }
 
-void tableView_willDisplayCell_forTableColumn_row(long /*int*/ id, long /*int*/ sel, long /*int*/ aTableView, long /*int*/ aCell, long /*int*/ aTableColumn, long /*int*/ rowIndex) {
+void tableView_willDisplayCell_forTableColumn_row(long id, long sel, long aTableView, long aCell, long aTableColumn, long rowIndex) {
 }
 
-void textViewDidChangeSelection(long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void textViewDidChangeSelection(long id, long sel, long aNotification) {
 }
 
-void textDidChange(long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void textDidChange(long id, long sel, long aNotification) {
 	callSuper (id, sel, aNotification);
 }
 
-void textDidEndEditing(long /*int*/ id, long /*int*/ sel, long /*int*/ aNotification) {
+void textDidEndEditing(long id, long sel, long aNotification) {
 	callSuper(id, sel, aNotification);
 }
 
-NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange(long /*int*/ id, long /*int*/ sel, long /*int*/ aTextView, long /*int*/ oldSelectedCharRange, long /*int*/ newSelectedCharRange) {
+NSRange textView_willChangeSelectionFromCharacterRange_toCharacterRange(long id, long sel, long aTextView, long oldSelectedCharRange, long newSelectedCharRange) {
 	return new NSRange();
 }
 
-NSRect titleRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame) {
+NSRect titleRectForBounds (long id, long sel, NSRect cellFrame) {
 	objc_super super_struct = new objc_super();
 	super_struct.receiver = id;
 	super_struct.super_class = OS.objc_msgSend(id, OS.sel_superclass);
@@ -2029,19 +2029,19 @@ NSRect titleRectForBounds (long /*int*/ id, long /*int*/ sel, NSRect cellFrame)
 	return result;
 }
 
-long /*int*/ toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar, long /*int*/ itemID, boolean flag) {
+long toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar(long id, long sel, long toolbar, long itemID, boolean flag) {
 	return 0;
 }
 
-long /*int*/ toolbarAllowedItemIdentifiers(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar) {
+long toolbarAllowedItemIdentifiers(long id, long sel, long toolbar) {
 	return 0;
 }
 
-long /*int*/ toolbarDefaultItemIdentifiers(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar) {
+long toolbarDefaultItemIdentifiers(long id, long sel, long toolbar) {
 	return 0;
 }
 
-long /*int*/ toolbarSelectableItemIdentifiers(long /*int*/ id, long /*int*/ sel, long /*int*/ toolbar) {
+long toolbarSelectableItemIdentifiers(long id, long sel, long toolbar) {
 	return 0;
 }
 String tooltipText () {
@@ -2064,127 +2064,127 @@ public String toString () {
 	return getName () + " {" + string + "}";
 }
 
-void touchesBeganWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void touchesBeganWithEvent (long id, long sel, long event) {
 	callSuper(id, sel, event);
 }
 
-void touchesCancelledWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void touchesCancelledWithEvent (long id, long sel, long event) {
 	callSuper(id, sel, event);
 }
 
-void touchesEndedWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void touchesEndedWithEvent (long id, long sel, long event) {
 	callSuper(id, sel, event);
 }
 
-void touchesMovedWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void touchesMovedWithEvent (long id, long sel, long event) {
 	callSuper(id, sel, event);
 }
 
-void beginGestureWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void beginGestureWithEvent (long id, long sel, long event) {
 	callSuper(id, sel, event);
 }
 
-void endGestureWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void endGestureWithEvent (long id, long sel, long event) {
 	callSuper(id, sel, event);
 }
 
-void magnifyWithEvent (long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void magnifyWithEvent (long id, long sel, long event) {
 	callSuper(id, sel, event);
 }
 
-void rotateWithEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void rotateWithEvent(long id, long sel, long event) {
 	callSuper(id, sel, event);
 }
 
-void swipeWithEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void swipeWithEvent(long id, long sel, long event) {
 	callSuper(id, sel, event);
 }
 
-void resetCursorRects (long /*int*/ id, long /*int*/ sel) {
+void resetCursorRects (long id, long sel) {
 	callSuper (id, sel);
 }
 
-void updateTrackingAreas (long /*int*/ id, long /*int*/ sel) {
+void updateTrackingAreas (long id, long sel) {
 	callSuper (id, sel);
 }
 
-long /*int*/ validAttributesForMarkedText (long /*int*/ id, long /*int*/ sel) {
+long validAttributesForMarkedText (long id, long sel) {
 	return 0;
 }
 
-void tabView_didSelectTabViewItem(long /*int*/ id, long /*int*/ sel, long /*int*/ tabView, long /*int*/ tabViewItem) {
+void tabView_didSelectTabViewItem(long id, long sel, long tabView, long tabViewItem) {
 }
 
-void tabView_willSelectTabViewItem(long /*int*/ id, long /*int*/ sel, long /*int*/ tabView, long /*int*/ tabViewItem) {
+void tabView_willSelectTabViewItem(long id, long sel, long tabView, long tabViewItem) {
 }
 
-boolean tableView_writeRowsWithIndexes_toPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2) {
+boolean tableView_writeRowsWithIndexes_toPasteboard(long id, long sel, long arg0, long arg1, long arg2) {
 	return false;
 }
 
-boolean validateMenuItem(long /*int*/ id, long /*int*/ sel, long /*int*/ menuItem) {
+boolean validateMenuItem(long id, long sel, long menuItem) {
 	return true;
 }
 
-long /*int*/ view_stringForToolTip_point_userData (long /*int*/ id, long /*int*/ sel, long /*int*/ view, long /*int*/ tag, long /*int*/ point, long /*int*/ userData) {
+long view_stringForToolTip_point_userData (long id, long sel, long view, long tag, long point, long userData) {
 	return 0;
 }
 
-void viewDidMoveToWindow(long /*int*/ id, long /*int*/ sel) {
+void viewDidMoveToWindow(long id, long sel) {
 }
 
-void viewWillMoveToWindow(long /*int*/ id, long /*int*/ sel, long /*int*/ arg0) {
+void viewWillMoveToWindow(long id, long sel, long arg0) {
 }
 
-void windowDidMove(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowDidMove(long id, long sel, long notification) {
 }
 
-void windowDidResize(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowDidResize(long id, long sel, long notification) {
 }
 
-void windowDidResignKey(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowDidResignKey(long id, long sel, long notification) {
 }
 
-void windowDidBecomeKey(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowDidBecomeKey(long id, long sel, long notification) {
 }
 
-void windowDidMiniturize(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowDidMiniturize(long id, long sel, long notification) {
 }
 
-void windowDidDeminiturize(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowDidDeminiturize(long id, long sel, long notification) {
 }
 
-void windowSendEvent(long /*int*/ id, long /*int*/ sel, long /*int*/ event) {
+void windowSendEvent(long id, long sel, long event) {
 	callSuper(id, sel, event);
 }
 
-boolean windowShouldClose(long /*int*/ id, long /*int*/ sel, long /*int*/ window) {
+boolean windowShouldClose(long id, long sel, long window) {
 	return false;
 }
 
-void windowWillClose(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void windowWillClose(long id, long sel, long notification) {
 }
 
-long /*int*/ nextState(long /*int*/ id, long /*int*/ sel) {
+long nextState(long id, long sel) {
 	return callSuperObject(id, sel);
 }
 
-void updateOpenGLContext(long /*int*/ id, long /*int*/ sel, long /*int*/ notification) {
+void updateOpenGLContext(long id, long sel, long notification) {
 }
 
-boolean shouldDrawInsertionPoint(long /*int*/ id, long /*int*/ sel) {
+boolean shouldDrawInsertionPoint(long id, long sel) {
 	return callSuperBoolean(id, sel);
 }
 
-boolean readSelectionFromPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ pasteboard) {
+boolean readSelectionFromPasteboard(long id, long sel, long pasteboard) {
 	return false;
 }
 
-long /*int*/ validRequestorForSendType(long /*int*/ id, long /*int*/ sel, long /*int*/ sendType, long /*int*/ returnType) {
+long validRequestorForSendType(long id, long sel, long sendType, long returnType) {
 	return callSuperObject(id, sel, sendType, returnType);
 }
 
-boolean writeSelectionToPasteboard(long /*int*/ id, long /*int*/ sel, long /*int*/ pasteboard, long /*int*/ types) {
+boolean writeSelectionToPasteboard(long id, long sel, long pasteboard, long types) {
 	return false;
 }