sys/osxvideo/cocoawindow.m: Fix compiler warnings on PPC64. Fixes bug #499318.

Original commit message from CVS:
Patch by: Thijs Vermeir <thijsvermeir at gmail dot com>
* sys/osxvideo/cocoawindow.m:
Fix compiler warnings on PPC64. Fixes bug #499318.

diff --git a/ChangeLog b/ChangeLog
index 3b5e292..b5d77f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-06  Sebastian Dröge  <slomo@circular-chaos.org>
+
+       Patch by: Thijs Vermeir <thijsvermeir at gmail dot com>
+
+       * sys/osxvideo/cocoawindow.m:
+       Fix compiler warnings on PPC64. Fixes bug #499318.
+
 2008-05-05  Wim Taymans  <wim.taymans@collabora.co.uk>
 
        Patch by: Sjoerd Simons <sjoerd at luon dot net>

diff --git a/common b/common
index f6fc3fa..9b28214 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit f6fc3fa7643c03eb912f4e259d48c99b0e8d0aca
+Subproject commit 9b28214399156457fd6b43d0604a47e4bdf19c28

diff --git a/sys/osxvideo/cocoawindow.m b/sys/osxvideo/cocoawindow.m
index c90dc60..9023e2d 100644 (file)
--- a/sys/osxvideo/cocoawindow.m
+++ b/sys/osxvideo/cocoawindow.m
@@ -170,7 +170,7 @@
 
   /* Free previous texture if any */
   if (pi_texture) {
-    glDeleteTextures (1, &pi_texture);
+    glDeleteTextures (1, (GLuint *)&pi_texture);
   }
 
   if (data) {
@@ -179,7 +179,7 @@
     data = g_malloc0(width * height * sizeof(short));
   }
   /* Create textures */
-  glGenTextures (1, &pi_texture);
+  glGenTextures (1, (GLuint *)&pi_texture);
 
   glEnable (GL_TEXTURE_RECTANGLE_EXT);
   glEnable (GL_UNPACK_CLIENT_STORAGE_APPLE);
@@ -262,7 +262,7 @@
 }
 
 - (void) drawRect:(NSRect) rect {
-  int params[] = { 1 };
+  GLint params[] = { 1 };
 
   [actualContext makeCurrentContext];