From 1ecf32e26780588bd3318ad68cb84c160ba32235 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Thu, 14 May 2009 18:01:25 +0000 Subject: [PATCH] Make it possible to compile with Xlib headers. Pray nobody does that who has evdev installed Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3384 --- src/gui/sdl_mapper.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp index 896790db..d8f3c4cb 100644 --- a/src/gui/sdl_mapper.cpp +++ b/src/gui/sdl_mapper.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: sdl_mapper.cpp,v 1.58 2009-04-25 06:59:54 qbix79 Exp $ */ +/* $Id: sdl_mapper.cpp,v 1.59 2009-05-14 18:01:25 qbix79 Exp $ */ #include #include @@ -2332,7 +2332,7 @@ void MAPPER_Init(void) { } } //Somehow including them at the top conflicts with something in setup.h -#ifdef LINUX +#ifdef C_X11_XKB #include "SDL_syswm.h" #include #endif @@ -2381,7 +2381,7 @@ void MAPPER_StartUp(Section * sec) { sdlkey_map[0x41]=SDLK_KP6; #elif !defined (WIN32) /* => Linux & BSDs */ bool evdev_input = false; -#ifdef LINUX +#ifdef C_X11_XKB SDL_SysWMinfo info; SDL_VERSION(&info.version); if (SDL_GetWMInfo(&info)) {