Mac generator and building 64 bit enabled C code

3 files changed, 74 insertions, 74 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c
index cdf2284819..7adc742281 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx.c
@@ -52,14 +52,14 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glViewport)
 #endif
 
 #ifndef NO__1glXChooseVisual
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXChooseVisual)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jintArray arg2)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXChooseVisual)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintArray arg2)
 {
 	jint *lparg2=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXChooseVisual_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)glXChooseVisual((Display *)arg0, arg1, lparg2);
+	rc = (jintLong)glXChooseVisual((Display *)arg0, arg1, lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	GLX_NATIVE_EXIT(env, that, _1glXChooseVisual_FUNC);
@@ -69,7 +69,7 @@ fail:
 
 #ifndef NO__1glXCopyContext
 JNIEXPORT void JNICALL GLX_NATIVE(_1glXCopyContext)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jint arg3)
 {
 	GLX_NATIVE_ENTER(env, that, _1glXCopyContext_FUNC);
 	glXCopyContext((Display *)arg0, (GLXContext)arg1, (GLXContext)arg2, arg3);
@@ -78,14 +78,14 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXCopyContext)
 #endif
 
 #ifndef NO__1glXCreateContext
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXCreateContext)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jboolean arg3)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXCreateContext)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2, jboolean arg3)
 {
 	XVisualInfo _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXCreateContext_FUNC);
 	if (arg1) if ((lparg1 = getXVisualInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)glXCreateContext((Display *)arg0, lparg1, (GLXContext)arg2, arg3);
+	rc = (jintLong)glXCreateContext((Display *)arg0, lparg1, (GLXContext)arg2, arg3);
 fail:
 	if (arg1 && lparg1) setXVisualInfoFields(env, arg1, lparg1);
 	GLX_NATIVE_EXIT(env, that, _1glXCreateContext_FUNC);
@@ -94,14 +94,14 @@ fail:
 #endif
 
 #ifndef NO__1glXCreateGLXPixmap
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXCreateGLXPixmap)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXCreateGLXPixmap)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2)
 {
 	XVisualInfo _arg1, *lparg1=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXCreateGLXPixmap_FUNC);
 	if (arg1) if ((lparg1 = getXVisualInfoFields(env, arg1, &_arg1)) == NULL) goto fail;
-	rc = (jint)glXCreateGLXPixmap((Display *)arg0, lparg1, (Pixmap)arg2);
+	rc = (jintLong)glXCreateGLXPixmap((Display *)arg0, lparg1, (Pixmap)arg2);
 fail:
 	if (arg1 && lparg1) setXVisualInfoFields(env, arg1, lparg1);
 	GLX_NATIVE_EXIT(env, that, _1glXCreateGLXPixmap_FUNC);
@@ -111,7 +111,7 @@ fail:
 
 #ifndef NO__1glXDestroyContext
 JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyContext)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	GLX_NATIVE_ENTER(env, that, _1glXDestroyContext_FUNC);
 	glXDestroyContext((Display *)arg0, (GLXContext)arg1);
@@ -121,7 +121,7 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyContext)
 
 #ifndef NO__1glXDestroyGLXPixmap
 JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyGLXPixmap)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	GLX_NATIVE_ENTER(env, that, _1glXDestroyGLXPixmap_FUNC);
 	glXDestroyGLXPixmap((Display *)arg0, (GLXPixmap)arg1);
@@ -130,12 +130,12 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXDestroyGLXPixmap)
 #endif
 
 #ifndef NO__1glXGetClientString
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetClientString)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXGetClientString)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXGetClientString_FUNC);
-	rc = (jint)glXGetClientString((Display *)arg0, arg1);
+	rc = (jintLong)glXGetClientString((Display *)arg0, arg1);
 	GLX_NATIVE_EXIT(env, that, _1glXGetClientString_FUNC);
 	return rc;
 }
@@ -143,7 +143,7 @@ JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetClientString)
 
 #ifndef NO__1glXGetConfig
 JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetConfig)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2, jintArray arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jint arg2, jintArray arg3)
 {
 	XVisualInfo _arg1, *lparg1=NULL;
 	jint *lparg3=NULL;
@@ -161,24 +161,24 @@ fail:
 #endif
 
 #ifndef NO__1glXGetCurrentContext
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetCurrentContext)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXGetCurrentContext)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXGetCurrentContext_FUNC);
-	rc = (jint)glXGetCurrentContext();
+	rc = (jintLong)glXGetCurrentContext();
 	GLX_NATIVE_EXIT(env, that, _1glXGetCurrentContext_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1glXGetCurrentDrawable
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetCurrentDrawable)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXGetCurrentDrawable)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXGetCurrentDrawable_FUNC);
-	rc = (jint)glXGetCurrentDrawable();
+	rc = (jintLong)glXGetCurrentDrawable();
 	GLX_NATIVE_EXIT(env, that, _1glXGetCurrentDrawable_FUNC);
 	return rc;
 }
@@ -186,7 +186,7 @@ JNIEXPORT jint JNICALL GLX_NATIVE(_1glXGetCurrentDrawable)
 
 #ifndef NO__1glXIsDirect
 JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXIsDirect)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXIsDirect_FUNC);
@@ -198,7 +198,7 @@ JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXIsDirect)
 
 #ifndef NO__1glXMakeCurrent
 JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXMakeCurrent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2)
 {
 	jboolean rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXMakeCurrent_FUNC);
@@ -210,7 +210,7 @@ JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXMakeCurrent)
 
 #ifndef NO__1glXQueryExtension
 JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXQueryExtension)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -228,24 +228,24 @@ fail:
 #endif
 
 #ifndef NO__1glXQueryExtensionsString
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXQueryExtensionsString)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXQueryExtensionsString)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXQueryExtensionsString_FUNC);
-	rc = (jint)glXQueryExtensionsString((Display *)arg0, arg1);
+	rc = (jintLong)glXQueryExtensionsString((Display *)arg0, arg1);
 	GLX_NATIVE_EXIT(env, that, _1glXQueryExtensionsString_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO__1glXQueryServerString
-JNIEXPORT jint JNICALL GLX_NATIVE(_1glXQueryServerString)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+JNIEXPORT jintLong JNICALL GLX_NATIVE(_1glXQueryServerString)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	GLX_NATIVE_ENTER(env, that, _1glXQueryServerString_FUNC);
-	rc = (jint)glXQueryServerString((Display *)arg0, arg1, arg2);
+	rc = (jintLong)glXQueryServerString((Display *)arg0, arg1, arg2);
 	GLX_NATIVE_EXIT(env, that, _1glXQueryServerString_FUNC);
 	return rc;
 }
@@ -253,7 +253,7 @@ JNIEXPORT jint JNICALL GLX_NATIVE(_1glXQueryServerString)
 
 #ifndef NO__1glXQueryVersion
 JNIEXPORT jboolean JNICALL GLX_NATIVE(_1glXQueryVersion)
-	(JNIEnv *env, jclass that, jint arg0, jintArray arg1, jintArray arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintArray arg1, jintArray arg2)
 {
 	jint *lparg1=NULL;
 	jint *lparg2=NULL;
@@ -272,7 +272,7 @@ fail:
 
 #ifndef NO__1glXSwapBuffers
 JNIEXPORT void JNICALL GLX_NATIVE(_1glXSwapBuffers)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	GLX_NATIVE_ENTER(env, that, _1glXSwapBuffers_FUNC);
 	glXSwapBuffers((Display *)arg0, (GLXDrawable)arg1);
@@ -302,7 +302,7 @@ JNIEXPORT void JNICALL GLX_NATIVE(_1glXWaitX)
 
 #ifndef NO_memmove
 JNIEXPORT void JNICALL GLX_NATIVE(memmove)
-	(JNIEnv *env, jclass that, jobject arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jobject arg0, jintLong arg1, jint arg2)
 {
 	XVisualInfo _arg0, *lparg0=NULL;
 	GLX_NATIVE_ENTER(env, that, memmove_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c
index 28494b96fc..7aec87e5af 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx/library/glx_structs.c
@@ -25,7 +25,7 @@ void cacheXVisualInfoFields(JNIEnv *env, jobject lpObject)
 {
 	if (XVisualInfoFc.cached) return;
 	XVisualInfoFc.clazz = (*env)->GetObjectClass(env, lpObject);
-	XVisualInfoFc.visual = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "visual", "I");
+	XVisualInfoFc.visual = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "visual", I_J);
 	XVisualInfoFc.visualid = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "visualid", "I");
 	XVisualInfoFc.screen = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "screen", "I");
 	XVisualInfoFc.depth = (*env)->GetFieldID(env, XVisualInfoFc.clazz, "depth", "I");
@@ -41,7 +41,7 @@ void cacheXVisualInfoFields(JNIEnv *env, jobject lpObject)
 XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
 {
 	if (!XVisualInfoFc.cached) cacheXVisualInfoFields(env, lpObject);
-	lpStruct->visual = (Visual *)(*env)->GetIntField(env, lpObject, XVisualInfoFc.visual);
+	lpStruct->visual = (Visual *)(*env)->GetIntLongField(env, lpObject, XVisualInfoFc.visual);
 	lpStruct->visualid = (*env)->GetIntField(env, lpObject, XVisualInfoFc.visualid);
 	lpStruct->screen = (*env)->GetIntField(env, lpObject, XVisualInfoFc.screen);
 	lpStruct->depth = (*env)->GetIntField(env, lpObject, XVisualInfoFc.depth);
@@ -57,7 +57,7 @@ XVisualInfo *getXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lp
 void setXVisualInfoFields(JNIEnv *env, jobject lpObject, XVisualInfo *lpStruct)
 {
 	if (!XVisualInfoFc.cached) cacheXVisualInfoFields(env, lpObject);
-	(*env)->SetIntField(env, lpObject, XVisualInfoFc.visual, (jint)lpStruct->visual);
+	(*env)->SetIntLongField(env, lpObject, XVisualInfoFc.visual, (jintLong)lpStruct->visual);
 	(*env)->SetIntField(env, lpObject, XVisualInfoFc.visualid, (jint)lpStruct->visualid);
 	(*env)->SetIntField(env, lpObject, XVisualInfoFc.screen, (jint)lpStruct->screen);
 	(*env)->SetIntField(env, lpObject, XVisualInfoFc.depth, (jint)lpStruct->depth);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c
index 7f3c3f0f12..85eed92707 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library/wgl.c
@@ -17,7 +17,7 @@
 
 #ifndef NO_ChoosePixelFormat
 JNIEXPORT jint JNICALL WGL_NATIVE(ChoosePixelFormat)
-	(JNIEnv *env, jclass that, jint arg0, jobject arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jobject arg1)
 {
 	PIXELFORMATDESCRIPTOR _arg1, *lparg1=NULL;
 	jint rc = 0;
@@ -33,7 +33,7 @@ fail:
 
 #ifndef NO_DescribePixelFormat
 JNIEXPORT jint JNICALL WGL_NATIVE(DescribePixelFormat)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jobject arg3)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jobject arg3)
 {
 	PIXELFORMATDESCRIPTOR _arg3, *lparg3=NULL;
 	jint rc = 0;
@@ -49,7 +49,7 @@ fail:
 
 #ifndef NO_GetPixelFormat
 JNIEXPORT jint JNICALL WGL_NATIVE(GetPixelFormat)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jint rc = 0;
 	WGL_NATIVE_ENTER(env, that, GetPixelFormat_FUNC);
@@ -61,7 +61,7 @@ JNIEXPORT jint JNICALL WGL_NATIVE(GetPixelFormat)
 
 #ifndef NO_SetPixelFormat
 JNIEXPORT jboolean JNICALL WGL_NATIVE(SetPixelFormat)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jobject arg2)
 {
 	PIXELFORMATDESCRIPTOR _arg2, *lparg2=NULL;
 	jboolean rc = 0;
@@ -77,7 +77,7 @@ fail:
 
 #ifndef NO_SwapBuffers
 JNIEXPORT jboolean JNICALL WGL_NATIVE(SwapBuffers)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, SwapBuffers_FUNC);
@@ -89,7 +89,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(SwapBuffers)
 
 #ifndef NO_wglCopyContext
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglCopyContext)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglCopyContext_FUNC);
@@ -100,24 +100,24 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglCopyContext)
 #endif
 
 #ifndef NO_wglCreateContext
-JNIEXPORT jint JNICALL WGL_NATIVE(wglCreateContext)
-	(JNIEnv *env, jclass that, jint arg0)
+JNIEXPORT jintLong JNICALL WGL_NATIVE(wglCreateContext)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglCreateContext_FUNC);
-	rc = (jint)wglCreateContext((HDC)arg0);
+	rc = (jintLong)wglCreateContext((HDC)arg0);
 	WGL_NATIVE_EXIT(env, that, wglCreateContext_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_wglCreateLayerContext
-JNIEXPORT jint JNICALL WGL_NATIVE(wglCreateLayerContext)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+JNIEXPORT jintLong JNICALL WGL_NATIVE(wglCreateLayerContext)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglCreateLayerContext_FUNC);
-	rc = (jint)wglCreateLayerContext((HDC)arg0, arg1);
+	rc = (jintLong)wglCreateLayerContext((HDC)arg0, arg1);
 	WGL_NATIVE_EXIT(env, that, wglCreateLayerContext_FUNC);
 	return rc;
 }
@@ -125,7 +125,7 @@ JNIEXPORT jint JNICALL WGL_NATIVE(wglCreateLayerContext)
 
 #ifndef NO_wglDeleteContext
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglDeleteContext)
-	(JNIEnv *env, jclass that, jint arg0)
+	(JNIEnv *env, jclass that, jintLong arg0)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglDeleteContext_FUNC);
@@ -137,7 +137,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglDeleteContext)
 
 #ifndef NO_wglDescribeLayerPlane
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglDescribeLayerPlane)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jobject arg4)
 {
 	LAYERPLANEDESCRIPTOR _arg4, *lparg4=NULL;
 	jboolean rc = 0;
@@ -152,24 +152,24 @@ fail:
 #endif
 
 #ifndef NO_wglGetCurrentContext
-JNIEXPORT jint JNICALL WGL_NATIVE(wglGetCurrentContext)
+JNIEXPORT jintLong JNICALL WGL_NATIVE(wglGetCurrentContext)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglGetCurrentContext_FUNC);
-	rc = (jint)wglGetCurrentContext();
+	rc = (jintLong)wglGetCurrentContext();
 	WGL_NATIVE_EXIT(env, that, wglGetCurrentContext_FUNC);
 	return rc;
 }
 #endif
 
 #ifndef NO_wglGetCurrentDC
-JNIEXPORT jint JNICALL WGL_NATIVE(wglGetCurrentDC)
+JNIEXPORT jintLong JNICALL WGL_NATIVE(wglGetCurrentDC)
 	(JNIEnv *env, jclass that)
 {
-	jint rc = 0;
+	jintLong rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglGetCurrentDC_FUNC);
-	rc = (jint)wglGetCurrentDC();
+	rc = (jintLong)wglGetCurrentDC();
 	WGL_NATIVE_EXIT(env, that, wglGetCurrentDC_FUNC);
 	return rc;
 }
@@ -177,7 +177,7 @@ JNIEXPORT jint JNICALL WGL_NATIVE(wglGetCurrentDC)
 
 #ifndef NO_wglGetLayerPaletteEntries
 JNIEXPORT jint JNICALL WGL_NATIVE(wglGetLayerPaletteEntries)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
@@ -192,14 +192,14 @@ fail:
 #endif
 
 #ifndef NO_wglGetProcAddress
-JNIEXPORT jint JNICALL WGL_NATIVE(wglGetProcAddress)
+JNIEXPORT jintLong JNICALL WGL_NATIVE(wglGetProcAddress)
 	(JNIEnv *env, jclass that, jbyteArray arg0)
 {
 	jbyte *lparg0=NULL;
-	jint rc = 0;
+	jintLong rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglGetProcAddress_FUNC);
 	if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail;
-	rc = (jint)wglGetProcAddress(lparg0);
+	rc = (jintLong)wglGetProcAddress(lparg0);
 fail:
 	if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0);
 	WGL_NATIVE_EXIT(env, that, wglGetProcAddress_FUNC);
@@ -209,7 +209,7 @@ fail:
 
 #ifndef NO_wglMakeCurrent
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglMakeCurrent)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglMakeCurrent_FUNC);
@@ -221,7 +221,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglMakeCurrent)
 
 #ifndef NO_wglRealizeLayerPalette
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglRealizeLayerPalette)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jboolean arg2)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jboolean arg2)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglRealizeLayerPalette_FUNC);
@@ -233,7 +233,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglRealizeLayerPalette)
 
 #ifndef NO_wglSetLayerPaletteEntries
 JNIEXPORT jint JNICALL WGL_NATIVE(wglSetLayerPaletteEntries)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jint arg2, jint arg3, jintArray arg4)
 {
 	jint *lparg4=NULL;
 	jint rc = 0;
@@ -249,7 +249,7 @@ fail:
 
 #ifndef NO_wglShareLists
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglShareLists)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglShareLists_FUNC);
@@ -261,7 +261,7 @@ JNIEXPORT jboolean JNICALL WGL_NATIVE(wglShareLists)
 
 #ifndef NO_wglSwapLayerBuffers
 JNIEXPORT jboolean JNICALL WGL_NATIVE(wglSwapLayerBuffers)
-	(JNIEnv *env, jclass that, jint arg0, jint arg1)
+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
 {
 	jboolean rc = 0;
 	WGL_NATIVE_ENTER(env, that, wglSwapLayerBuffers_FUNC);