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.
This commit is contained in:
Thijs Vermeir 2008-05-06 09:33:46 +00:00 committed by Sebastian Dröge
parent 89b114fe44
commit 1973c62992
3 changed files with 11 additions and 4 deletions

View file

@ -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> 2008-05-05 Wim Taymans <wim.taymans@collabora.co.uk>
Patch by: Sjoerd Simons <sjoerd at luon dot net> Patch by: Sjoerd Simons <sjoerd at luon dot net>

2
common

@ -1 +1 @@
Subproject commit f6fc3fa7643c03eb912f4e259d48c99b0e8d0aca Subproject commit 9b28214399156457fd6b43d0604a47e4bdf19c28

View file

@ -170,7 +170,7 @@
/* Free previous texture if any */ /* Free previous texture if any */
if (pi_texture) { if (pi_texture) {
glDeleteTextures (1, &pi_texture); glDeleteTextures (1, (GLuint *)&pi_texture);
} }
if (data) { if (data) {
@ -179,7 +179,7 @@
data = g_malloc0(width * height * sizeof(short)); data = g_malloc0(width * height * sizeof(short));
} }
/* Create textures */ /* Create textures */
glGenTextures (1, &pi_texture); glGenTextures (1, (GLuint *)&pi_texture);
glEnable (GL_TEXTURE_RECTANGLE_EXT); glEnable (GL_TEXTURE_RECTANGLE_EXT);
glEnable (GL_UNPACK_CLIENT_STORAGE_APPLE); glEnable (GL_UNPACK_CLIENT_STORAGE_APPLE);
@ -262,7 +262,7 @@
} }
- (void) drawRect:(NSRect) rect { - (void) drawRect:(NSRect) rect {
int params[] = { 1 }; GLint params[] = { 1 };
[actualContext makeCurrentContext]; [actualContext makeCurrentContext];