We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch

10.5.diff2 (text/plain), 2.63 KB, created by Alexei Svitkine on 2012-01-05 16:06:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexei Svitkine

Created: 2012-01-05 16:06:34 UTC

Size: 2.63 KB

patch

obsolete

>diff -r 8a1bc41db6bb src/cdrom/macosx/AudioFilePlayer.h
>--- a/src/cdrom/macosx/AudioFilePlayer.h	Mon Jan 02 21:25:34 2012 -0800
>+++ b/src/cdrom/macosx/AudioFilePlayer.h	Thu Jan 05 19:05:32 2012 -0500
>@@ -37,7 +37,7 @@
> #include <AudioUnit/AUNTComponent.h>
> #endif
> 
>-#if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1050)
>+#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1050)
> typedef SInt16 FSIORefNum;
> #endif
> 
>diff -r 8a1bc41db6bb src/video/quartz/SDL_QuartzVideo.m
>--- a/src/video/quartz/SDL_QuartzVideo.m	Mon Jan 02 21:25:34 2012 -0800
>+++ b/src/video/quartz/SDL_QuartzVideo.m	Thu Jan 05 19:05:32 2012 -0500
>@@ -36,7 +36,18 @@
>     __IPHONE_NA, __IPHONE_NA);
> #endif
> 
>-#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060)  /* Fixed in Snow Leopard */
>+
>+static inline BOOL IS_LION_OR_LATER(_THIS)
>+{
>+    return (system_version >= 0x1070);
>+}
>+
>+static inline BOOL IS_SNOW_LEOPARD_OR_LATER(_THIS)
>+{
>+    return (system_version >= 0x1060);
>+}
>+
>+#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1060) && !defined(__LP64__)  /* Fixed in Snow Leopard */
> /*
>     Add methods to get at private members of NSScreen. 
>     Since there is a bug in Apple's screen switching code
>@@ -54,12 +65,14 @@
>     _frame = frame;
> }
> @end
>-static inline void QZ_SetFrame(NSScreen *nsscreen, NSRect frame)
>+static inline void QZ_SetFrame(_THIS, NSScreen *nsscreen, NSRect frame)
> {
>-    [nsscreen setFrame:frame];
>+    if (!IS_SNOW_LEOPARD_OR_LATER(this)) {
>+        [nsscreen setFrame:frame];
>+    }
> }
> #else
>-static inline void QZ_SetFrame(NSScreen *nsscreen, NSRect frame)
>+static inline void QZ_SetFrame(_THIS, NSScreen *nsscreen, NSRect frame)
> {
> }
> #endif
>@@ -125,16 +138,6 @@
> #  endif
> #endif
> 
>-static inline BOOL IS_LION_OR_LATER(_THIS)
>-{
>-    return (system_version >= 0x1070);
>-}
>-
>-static inline BOOL IS_SNOW_LEOPARD_OR_LATER(_THIS)
>-{
>-    return (system_version >= 0x1060);
>-}
>-
> static void QZ_ReleaseDisplayMode(_THIS, const void *moderef)
> {
>     /* we only own these references in the 10.6+ API. */
>@@ -607,7 +610,7 @@
>                 See comment in QZ_SetVideoFullscreen for why we do this
>             */
>             screen_rect = NSMakeRect(0,0,device_width,device_height);
>-            QZ_SetFrame([ NSScreen mainScreen ], screen_rect);
>+            QZ_SetFrame(this, [ NSScreen mainScreen ], screen_rect);
>         }
>     }
>     /* Release window mode resources */
>@@ -927,7 +930,7 @@
>         ourselves. This hack should be removed if/when the bug is fixed.
>     */
>     screen_rect = NSMakeRect(0,0,width,height);
>-    QZ_SetFrame([ NSScreen mainScreen ], screen_rect);
>+    QZ_SetFrame(this, [ NSScreen mainScreen ], screen_rect);
> 
>     /* Save the flags to ensure correct tear-down */
>     mode_flags = current->flags;

Actions: View | Diff

Attachments on bug 1363: 762 | 763

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.