diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | sys/osxvideo/cocoawindow.m | 6 |
3 files changed, 10 insertions, 3 deletions
@@ -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 -Subproject f6fc3fa7643c03eb912f4e259d48c99b0e8d0ac +Subproject 9b28214399156457fd6b43d0604a47e4bdf19c2 diff --git a/sys/osxvideo/cocoawindow.m b/sys/osxvideo/cocoawindow.m index c90dc604..9023e2d4 100644 --- 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]; |