diff options
| author | Thijs Vermeir <thijsvermeir@gmail.com> | 2008-05-06 09:33:46 +0000 | 
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-05-06 09:33:46 +0000 | 
| commit | 1973c629926b95b532b7d2efc2c8e01f989b9ebc (patch) | |
| tree | 2b74ea3ecb8411f46e7eb1a682a4573efe0b5c43 | |
| parent | 89b114fe44016c9bf96662fdebfc048f8540ee1d (diff) | |
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.
| -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];  | 
