Revert MIR_CFLAGS to SDL_CFLAGS. Use forward declaration for the real fix. (We shouldn't expose mir headers!)
authorBrandon Schaefer <brandon.schaefer@canonical.com>
Mon, 21 Apr 2014 12:42:25 -0700
changeset 8731ede9d13dad21
parent 8729 94af945dbb57
child 8732 c62baa0b8827
Revert MIR_CFLAGS to SDL_CFLAGS. Use forward declaration for the real fix. (We shouldn't expose mir headers!)
configure.in
include/SDL_syswm.h
     1.1 --- a/configure.in	Sat Apr 19 13:15:53 2014 -0700
     1.2 +++ b/configure.in	Mon Apr 21 12:42:25 2014 -0700
     1.3 @@ -1299,7 +1299,6 @@
     1.4                  EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MIR_LIBS"
     1.5                  SUMMARY_video="${SUMMARY_video} mir"
     1.6              fi
     1.7 -            SDL_CFLAGS="$SDL_CFLAGS $MIR_CFLAGS"
     1.8              have_video=yes
     1.9          fi
    1.10      fi
     2.1 --- a/include/SDL_syswm.h	Sat Apr 19 13:15:53 2014 -0700
     2.2 +++ b/include/SDL_syswm.h	Mon Apr 21 12:42:25 2014 -0700
     2.3 @@ -98,11 +98,6 @@
     2.4  #endif
     2.5  #endif
     2.6  
     2.7 -#if defined(SDL_VIDEO_DRIVER_MIR)
     2.8 -#include <mir_toolkit/mir_client_library.h>
     2.9 -#endif
    2.10 -
    2.11 -
    2.12  /**
    2.13   *  These are the various supported windowing subsystems
    2.14   */
    2.15 @@ -225,8 +220,8 @@
    2.16  #if defined(SDL_VIDEO_DRIVER_MIR)
    2.17          struct
    2.18          {
    2.19 -            MirConnection *connection;  /**< Mir display server connection */
    2.20 -            MirSurface *surface;  /**< Mir surface */
    2.21 +            struct MirConnection *connection;  /**< Mir display server connection */
    2.22 +            struct MirSurface *surface;  /**< Mir surface */
    2.23          } mir;
    2.24  #endif
    2.25