From 981d972f3da3418e58da11515db6979d3f85a08a Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 10 Apr 2015 23:42:01 -0400 Subject: Add missing #includes. --- textscreen/txt_window.c | 1 + textscreen/txt_window_action.c | 1 + 2 files changed, 2 insertions(+) (limited to 'textscreen') diff --git a/textscreen/txt_window.c b/textscreen/txt_window.c index 7b2e3568..bd892ac9 100644 --- a/textscreen/txt_window.c +++ b/textscreen/txt_window.c @@ -12,6 +12,7 @@ // GNU General Public License for more details. // +#include #include #include #include diff --git a/textscreen/txt_window_action.c b/textscreen/txt_window_action.c index a5fe84dc..94210d56 100644 --- a/textscreen/txt_window_action.c +++ b/textscreen/txt_window_action.c @@ -14,6 +14,7 @@ #include #include +#include #include "doomkeys.h" -- cgit v1.2.3 From fa3dc6f58921ec8299b1ec49913b75fda1659e74 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 10 Apr 2015 23:44:13 -0400 Subject: Strip out SDL_VERSION_ATLEAST #ifdef conditionals. These were added ages ago as hacks to make the code compile with SDL2, back when SDL2 was still in development. They aren't relevant any more and aren't useful - the actual SDL2 port is proceeding on sdl2-branch. --- textscreen/txt_sdl.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'textscreen') diff --git a/textscreen/txt_sdl.c b/textscreen/txt_sdl.c index 5399c088..7d0e9a3e 100644 --- a/textscreen/txt_sdl.c +++ b/textscreen/txt_sdl.c @@ -412,11 +412,7 @@ void TXT_UpdateScreen(void) void TXT_GetMousePosition(int *x, int *y) { -#if SDL_VERSION_ATLEAST(1, 3, 0) - SDL_GetMouseState(0, x, y); -#else SDL_GetMouseState(x, y); -#endif *x /= font->w; *y /= font->h; @@ -466,10 +462,8 @@ static int TranslateKey(SDL_keysym *sym) case SDLK_LALT: case SDLK_RALT: -#if !SDL_VERSION_ATLEAST(1, 3, 0) case SDLK_LMETA: case SDLK_RMETA: -#endif return KEY_RALT; case SDLK_CAPSLOCK: return KEY_CAPSLOCK; @@ -604,10 +598,8 @@ static void UpdateModifierState(SDL_keysym *sym, int pressed) case SDLK_LALT: case SDLK_RALT: -#if !SDL_VERSION_ATLEAST(1, 3, 0) case SDLK_LMETA: case SDLK_RMETA: -#endif mod = TXT_MOD_ALT; break; -- cgit v1.2.3