From ae2a50fc8fe45b2515bfcd7b84fe27e2a9dab247 Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandon.schaefer@canonical.com>
Date: Mon, 21 Apr 2014 12:42:25 -0700
Subject: [PATCH] Revert MIR_CFLAGS to SDL_CFLAGS. Use forward declaration for
 the real fix. (We shouldn't expose mir headers!)

---
 configure.in        | 1 -
 include/SDL_syswm.h | 9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/configure.in b/configure.in
index 8eccc37b8e74a..ae3200c257e1f 100644
--- a/configure.in
+++ b/configure.in
@@ -1299,7 +1299,6 @@ AC_HELP_STRING([--enable-mir-shared], [dynamically load Mir support [[default=ma
                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MIR_LIBS"
                 SUMMARY_video="${SUMMARY_video} mir"
             fi
-            SDL_CFLAGS="$SDL_CFLAGS $MIR_CFLAGS"
             have_video=yes
         fi
     fi
diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h
index a3fe73861c72a..59277ecff923b 100644
--- a/include/SDL_syswm.h
+++ b/include/SDL_syswm.h
@@ -98,11 +98,6 @@ typedef struct _UIViewController UIViewController;
 #endif
 #endif
 
-#if defined(SDL_VIDEO_DRIVER_MIR)
-#include <mir_toolkit/mir_client_library.h>
-#endif
-
-
 /**
  *  These are the various supported windowing subsystems
  */
@@ -225,8 +220,8 @@ struct SDL_SysWMinfo
 #if defined(SDL_VIDEO_DRIVER_MIR)
         struct
         {
-            MirConnection *connection;  /**< Mir display server connection */
-            MirSurface *surface;  /**< Mir surface */
+            struct MirConnection *connection;  /**< Mir display server connection */
+            struct MirSurface *surface;  /**< Mir surface */
         } mir;
 #endif