From d5c9afd449fba640138736379e3c8ae36c0d7f37 Mon Sep 17 00:00:00 2001
From: bushing <bushing@gmail.com>
Date: Mon, 8 Dec 2008 09:58:02 +0000
Subject: [PATCH] Xquartz doesn't support XF86VidMode, nor does it support
 fullscreen mode

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1447 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 5 ++++-
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h   | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index 65754bc32a..9eedecc7f2 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -376,6 +376,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
     GLWin.attr.colormap = cmap;
     GLWin.attr.border_pixel = 0;
 
+#ifndef __APPLE__
     // get a connection
     XF86VidModeQueryVersion(GLWin.dpy, &vidModeMajorVersion, &vidModeMinorVersion);
 
@@ -428,7 +429,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
             GLWin.fs = 0;
         }
     }
-    
+#endif    
     
     if (!GLWin.fs) {
 
@@ -709,6 +710,7 @@ void OpenGL_Shutdown()
         XCloseDisplay(GLWin.dpy);
         GLWin.ctx = NULL;
     }
+#ifndef __APPLE__
     /* switch back to original desktop resolution if we were in fs */
     if (GLWin.dpy != NULL) {
         if (GLWin.fs) {
@@ -717,4 +719,5 @@ void OpenGL_Shutdown()
         }
     }
 #endif
+#endif
 }
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
index c11264ae84..e662bd16aa 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
@@ -94,7 +94,9 @@ inline unsigned long timeGetTime()
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
+#ifndef __APPLE__
 #include <X11/extensions/xf86vmode.h>
+#endif
 //#include <gtk/gtk.h>
 #endif
 #include <sys/stat.h>
@@ -112,7 +114,9 @@ typedef struct {
     XSetWindowAttributes attr;
     Bool fs;
     Bool doubleBuffered;
+#ifndef __APPLE__
     XF86VidModeModeInfo deskMode;
+#endif
 #endif
     int x, y;
     unsigned int width, height;