(svn r21245) -Fix (r21200): [OSX] Make gcc 4.2 happy

This commit is contained in:
planetmaker 2010-11-18 20:45:27 +00:00
parent 16c90ed48b
commit 94c45d9cc3

View File

@ -264,9 +264,10 @@ class FullscreenSubdriver: public CocoaSubdriver {
bool SetVideoMode(int w, int h) bool SetVideoMode(int w, int h)
{ {
/* Define this variables at the top (against coding style) because /* Define this variables at the top (against coding style) because
* otherwise GCC barfs at the goto's jumping over variable initialization. */ * otherwise GCC 4.2 barfs at the goto's jumping over variable initialization. */
NSRect screen_rect; NSRect screen_rect;
int gamma_error; int gamma_error;
NSPoint mouseLocation;
/* Destroy any previous mode */ /* Destroy any previous mode */
if (this->pixel_buffer != NULL) { if (this->pixel_buffer != NULL) {
@ -299,7 +300,7 @@ class FullscreenSubdriver: public CocoaSubdriver {
CGDisplayCapture(this->display_id); CGDisplayCapture(this->display_id);
/* Store the mouse coordinates relative to the total screen */ /* Store the mouse coordinates relative to the total screen */
NSPoint mouseLocation = [ NSEvent mouseLocation ]; mouseLocation = [ NSEvent mouseLocation ];
mouseLocation.x /= this->display_width; mouseLocation.x /= this->display_width;
mouseLocation.y /= this->display_height; mouseLocation.y /= this->display_height;