fixing warnings with -Wall

8 files changed, 46 insertions, 42 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
index 53019a7de8..6692497d51 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
@@ -745,7 +745,7 @@ OS_AddDataBrowserItems_4=cast=(DataBrowserPropertyID)
 
 OS_AddDataBrowserListViewColumn=
 OS_AddDataBrowserListViewColumn_0=cast=(ControlRef)
-OS_AddDataBrowserListViewColumn_1=cast=(DataBrowserListViewColumnDesc *),flags=init
+OS_AddDataBrowserListViewColumn_1=cast=(DataBrowserListViewColumnDesc *)
 OS_AddDataBrowserListViewColumn_2=cast=(DataBrowserTableViewColumnIndex)
 
 OS_AddDragItemFlavor=
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.opengl.carbon.AGL.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.opengl.carbon.AGL.properties
index 48e41a0742..d324ebf899 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.opengl.carbon.AGL.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.opengl.carbon.AGL.properties
@@ -10,55 +10,55 @@
 ###############################################################################
 org_eclipse_swt_internal_opengl_carbon_AGL=
 AGL_aglChoosePixelFormat=
-AGL_aglChoosePixelFormat_0=
+AGL_aglChoosePixelFormat_0=cast=const AGLDevice *
 AGL_aglChoosePixelFormat_1=
-AGL_aglChoosePixelFormat_2=
+AGL_aglChoosePixelFormat_2=cast=const GLint *
 
 AGL_aglCreateContext=
-AGL_aglCreateContext_0=
-AGL_aglCreateContext_1=
+AGL_aglCreateContext_0=cast=AGLPixelFormat
+AGL_aglCreateContext_1=cast=AGLContext
 
 AGL_aglDescribePixelFormat=
-AGL_aglDescribePixelFormat_0=
-AGL_aglDescribePixelFormat_1=
-AGL_aglDescribePixelFormat_2=
+AGL_aglDescribePixelFormat_0=cast=AGLPixelFormat
+AGL_aglDescribePixelFormat_1=cast=GLint
+AGL_aglDescribePixelFormat_2=cast=GLint *
 
 AGL_aglDestroyContext=
-AGL_aglDestroyContext_0=
+AGL_aglDestroyContext_0=cast=AGLContext
 
 AGL_aglDestroyPixelFormat=
-AGL_aglDestroyPixelFormat_0=
+AGL_aglDestroyPixelFormat_0=cast=AGLPixelFormat
 
 AGL_aglEnable=
-AGL_aglEnable_0=
-AGL_aglEnable_1=
+AGL_aglEnable_0=cast=AGLContext
+AGL_aglEnable_1=cast=GLenum
 
 AGL_aglGetCurrentContext=
 
 AGL_aglGetDrawable=
-AGL_aglGetDrawable_0=
+AGL_aglGetDrawable_0=cast=AGLContext
 
 AGL_aglSetCurrentContext=
-AGL_aglSetCurrentContext_0=
+AGL_aglSetCurrentContext_0=cast=AGLContext
 
 AGL_aglSetDrawable=
-AGL_aglSetDrawable_0=
-AGL_aglSetDrawable_1=
+AGL_aglSetDrawable_0=cast=AGLContext
+AGL_aglSetDrawable_1=cast=AGLDrawable
 
 AGL_aglSetInteger__III=
-AGL_aglSetInteger__III_0=
-AGL_aglSetInteger__III_1=
-AGL_aglSetInteger__III_2=
+AGL_aglSetInteger__III_0=cast=(AGLContext)
+AGL_aglSetInteger__III_1=cast=GLenum
+AGL_aglSetInteger__III_2=cast=const GLint *
 
 AGL_aglSetInteger__II_3I=
-AGL_aglSetInteger__II_3I_0=
-AGL_aglSetInteger__II_3I_1=
-AGL_aglSetInteger__II_3I_2=
+AGL_aglSetInteger__II_3I_0=cast=(AGLContext)
+AGL_aglSetInteger__II_3I_1=cast=GLenum
+AGL_aglSetInteger__II_3I_2=cast=const GLint *
 
 AGL_aglSwapBuffers=
-AGL_aglSwapBuffers_0=
+AGL_aglSwapBuffers_0=cast=AGLContext
 
 AGL_aglUpdateContext=
-AGL_aglUpdateContext_0=
+AGL_aglUpdateContext_0=cast=AGLContext
 
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl.c b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl.c
index 64e5aeab9a..084aee9ae6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl.c
@@ -23,7 +23,7 @@ JNIEXPORT jint JNICALL AGL_NATIVE(aglChoosePixelFormat)
 	jint rc = 0;
 	AGL_NATIVE_ENTER(env, that, aglChoosePixelFormat_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jint)aglChoosePixelFormat(arg0, arg1, lparg2);
+	rc = (jint)aglChoosePixelFormat((const AGLDevice *)arg0, arg1, (const GLint *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	AGL_NATIVE_EXIT(env, that, aglChoosePixelFormat_FUNC);
@@ -37,7 +37,7 @@ JNIEXPORT jint JNICALL AGL_NATIVE(aglCreateContext)
 {
 	jint rc = 0;
 	AGL_NATIVE_ENTER(env, that, aglCreateContext_FUNC);
-	rc = (jint)aglCreateContext(arg0, arg1);
+	rc = (jint)aglCreateContext((AGLPixelFormat)arg0, (AGLContext)arg1);
 	AGL_NATIVE_EXIT(env, that, aglCreateContext_FUNC);
 	return rc;
 }
@@ -51,7 +51,7 @@ JNIEXPORT jboolean JNICALL AGL_NATIVE(aglDescribePixelFormat)
 	jboolean rc = 0;
 	AGL_NATIVE_ENTER(env, that, aglDescribePixelFormat_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jboolean)aglDescribePixelFormat(arg0, arg1, lparg2);
+	rc = (jboolean)aglDescribePixelFormat((AGLPixelFormat)arg0, (GLint)arg1, (GLint *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	AGL_NATIVE_EXIT(env, that, aglDescribePixelFormat_FUNC);
@@ -65,7 +65,7 @@ JNIEXPORT jboolean JNICALL AGL_NATIVE(aglDestroyContext)
 {
 	jboolean rc = 0;
 	AGL_NATIVE_ENTER(env, that, aglDestroyContext_FUNC);
-	rc = (jboolean)aglDestroyContext(arg0);
+	rc = (jboolean)aglDestroyContext((AGLContext)arg0);
 	AGL_NATIVE_EXIT(env, that, aglDestroyContext_FUNC);
 	return rc;
 }
@@ -76,7 +76,7 @@ JNIEXPORT void JNICALL AGL_NATIVE(aglDestroyPixelFormat)
 	(JNIEnv *env, jclass that, jint arg0)
 {
 	AGL_NATIVE_ENTER(env, that, aglDestroyPixelFormat_FUNC);
-	aglDestroyPixelFormat(arg0);
+	aglDestroyPixelFormat((AGLPixelFormat)arg0);
 	AGL_NATIVE_EXIT(env, that, aglDestroyPixelFormat_FUNC);
 }
 #endif
@@ -87,7 +87,7 @@ JNIEXPORT jboolean JNICALL AGL_NATIVE(aglEnable)
 {
 	jboolean rc = 0;
 	AGL_NATIVE_ENTER(env, that, aglEnable_FUNC);
-	rc = (jboolean)aglEnable(arg0, arg1);
+	rc = (jboolean)aglEnable((AGLContext)arg0, (GLenum)arg1);
 	AGL_NATIVE_EXIT(env, that, aglEnable_FUNC);
 	return rc;
 }
@@ -111,7 +111,7 @@ JNIEXPORT jint JNICALL AGL_NATIVE(aglGetDrawable)
 {
 	jint rc = 0;
 	AGL_NATIVE_ENTER(env, that, aglGetDrawable_FUNC);
-	rc = (jint)aglGetDrawable(arg0);
+	rc = (jint)aglGetDrawable((AGLContext)arg0);
 	AGL_NATIVE_EXIT(env, that, aglGetDrawable_FUNC);
 	return rc;
 }
@@ -123,7 +123,7 @@ JNIEXPORT jboolean JNICALL AGL_NATIVE(aglSetCurrentContext)
 {
 	jboolean rc = 0;
 	AGL_NATIVE_ENTER(env, that, aglSetCurrentContext_FUNC);
-	rc = (jboolean)aglSetCurrentContext(arg0);
+	rc = (jboolean)aglSetCurrentContext((AGLContext)arg0);
 	AGL_NATIVE_EXIT(env, that, aglSetCurrentContext_FUNC);
 	return rc;
 }
@@ -135,7 +135,7 @@ JNIEXPORT jboolean JNICALL AGL_NATIVE(aglSetDrawable)
 {
 	jboolean rc = 0;
 	AGL_NATIVE_ENTER(env, that, aglSetDrawable_FUNC);
-	rc = (jboolean)aglSetDrawable(arg0, arg1);
+	rc = (jboolean)aglSetDrawable((AGLContext)arg0, (AGLDrawable)arg1);
 	AGL_NATIVE_EXIT(env, that, aglSetDrawable_FUNC);
 	return rc;
 }
@@ -147,7 +147,7 @@ JNIEXPORT jboolean JNICALL AGL_NATIVE(aglSetInteger__III)
 {
 	jboolean rc = 0;
 	AGL_NATIVE_ENTER(env, that, aglSetInteger__III_FUNC);
-	rc = (jboolean)aglSetInteger(arg0, arg1, arg2);
+	rc = (jboolean)aglSetInteger((AGLContext)arg0, (GLenum)arg1, (const GLint *)arg2);
 	AGL_NATIVE_EXIT(env, that, aglSetInteger__III_FUNC);
 	return rc;
 }
@@ -161,7 +161,7 @@ JNIEXPORT jboolean JNICALL AGL_NATIVE(aglSetInteger__II_3I)
 	jboolean rc = 0;
 	AGL_NATIVE_ENTER(env, that, aglSetInteger__II_3I_FUNC);
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jboolean)aglSetInteger(arg0, arg1, lparg2);
+	rc = (jboolean)aglSetInteger((AGLContext)arg0, (GLenum)arg1, (const GLint *)lparg2);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 	AGL_NATIVE_EXIT(env, that, aglSetInteger__II_3I_FUNC);
@@ -174,7 +174,7 @@ JNIEXPORT void JNICALL AGL_NATIVE(aglSwapBuffers)
 	(JNIEnv *env, jclass that, jint arg0)
 {
 	AGL_NATIVE_ENTER(env, that, aglSwapBuffers_FUNC);
-	aglSwapBuffers(arg0);
+	aglSwapBuffers((AGLContext)arg0);
 	AGL_NATIVE_EXIT(env, that, aglSwapBuffers_FUNC);
 }
 #endif
@@ -185,7 +185,7 @@ JNIEXPORT jboolean JNICALL AGL_NATIVE(aglUpdateContext)
 {
 	jboolean rc = 0;
 	AGL_NATIVE_ENTER(env, that, aglUpdateContext_FUNC);
-	rc = (jboolean)aglUpdateContext(arg0);
+	rc = (jboolean)aglUpdateContext((AGLContext)arg0);
 	AGL_NATIVE_EXIT(env, that, aglUpdateContext_FUNC);
 	return rc;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl.h b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl.h
index 7435601517..6f01b3886e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT OpenGL/carbon/library/agl.h
@@ -13,5 +13,6 @@
 #define SWT_AGL_H_INCLUDED
 
 #include <OpenGL/gl.h>
+#include <AGL/agl.h>
 
 #endif /* SWT_AGL_H_INCLUDED */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/make_macosx.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/make_macosx.mak
index bae521bf5c..9ca8a218fd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/make_macosx.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/make_macosx.mak
@@ -29,7 +29,7 @@ AGL_LIB=lib$(SWTAGL_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib
 
 #SWT_DEBUG = -g
 ARCHS = -arch i386 -arch ppc
-CFLAGS = -c $(ARCHS) -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) $(SWT_DEBUG) -DCARBON -I /System/Library/Frameworks/JavaVM.framework/Headers
+CFLAGS = -c -Wall $(ARCHS) -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) $(SWT_DEBUG) -DCARBON -I /System/Library/Frameworks/JavaVM.framework/Headers
 LFLAGS = -bundle $(ARCHS) -framework JavaVM -framework Carbon 
 WEBKITCFLAGS = -c $(ARCHS) -xobjective-c -I /System/Library/Frameworks/JavaVM.framework/Headers -I /System/Library/Frameworks/Cocoa.framework/Headers -I /System/Library/Frameworks/WebKit.framework/Headers
 WEBKITLFLAGS = $(LFLAGS) -framework WebKit -framework Cocoa
@@ -37,7 +37,7 @@ AGLLFLAGS = $(LFLAGS) -framework OpenGL -framework AGL
 SWT_OBJECTS = swt.o callback.o
 SWTPI_OBJECTS = swt.o os.o os_custom.o os_structs.o os_stats.o
 WEBKIT_OBJECTS = webkit.o
-AGL_OBJECTS = agl.o agl_stats.o
+AGL_OBJECTS = swt.o agl.o agl_stats.o
 
 all: $(SWT_LIB) $(SWTPI_LIB) $(WEBKIT_LIB) $(AGL_LIB)
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
index 6b1e5f6a1c..da3e4aafdb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
@@ -802,7 +802,7 @@ fail:
 JNIEXPORT jint JNICALL OS_NATIVE(AddDataBrowserListViewColumn)
 	(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
 {
-	DataBrowserListViewColumnDesc _arg1={0}, *lparg1=NULL;
+	DataBrowserListViewColumnDesc _arg1, *lparg1=NULL;
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, AddDataBrowserListViewColumn_FUNC);
 	if (arg1) if ((lparg1 = getDataBrowserListViewColumnDescFields(env, arg1, &_arg1)) == NULL) goto fail;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.h
index 526f11c8cd..ddb1a8242c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.h
@@ -15,7 +15,12 @@
 /*#define NDEBUG*/
 
 #include <Carbon/Carbon.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "os_custom.h"
 
+extern jint CPSEnableForegroundOperation(jint *, jint, jint, jint, jint);
+extern jint CPSSetProcessName(jint *, jbyte *);
+
 #endif /* INC_os_H */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_custom.c
index 35b825c1d3..1820c11f10 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_custom.c
@@ -22,7 +22,6 @@ JNIEXPORT jint JNICALL OS_NATIVE(NewGlobalRef)
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, NewGlobalRef_FUNC);
 	rc = (jint)(*env)->NewGlobalRef(env, arg0);
-fail:
 	OS_NATIVE_EXIT(env, that, NewGlobalRef_FUNC);
 	return rc;
 }
@@ -45,7 +44,6 @@ JNIEXPORT jobject JNICALL OS_NATIVE(JNIGetObject)
 	jobject rc = 0;
 	OS_NATIVE_ENTER(env, that, JNIGetObject_FUNC);
 	rc = (jobject)arg0;
-fail:
 	OS_NATIVE_EXIT(env, that, JNIGetObject_FUNC);
 	return rc;
 }