Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom

10 files changed, 10 insertions, 22 deletions

diff --git a/opl/examples/droplay.c b/opl/examples/droplay.c
index 7b20e03d..16e10c3c 100644
--- a/opl/examples/droplay.c
+++ b/opl/examples/droplay.c
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "SDL.h"
 
diff --git a/src/heretic/mn_menu.c b/src/heretic/mn_menu.c
index b0a8d6b7..4cd52a0d 100644
--- a/src/heretic/mn_menu.c
+++ b/src/heretic/mn_menu.c
@@ -16,6 +16,7 @@
 
 // MN_menu.c
 
+#include <stdlib.h>
 #include <ctype.h>
 
 #include "deh_str.h"
diff --git a/src/heretic/p_saveg.c b/src/heretic/p_saveg.c
index 3bd7c2b2..34e9e906 100644
--- a/src/heretic/p_saveg.c
+++ b/src/heretic/p_saveg.c
@@ -16,6 +16,8 @@
 
 // P_tick.c
 
+#include <stdlib.h>
+
 #include "doomdef.h"
 #include "i_swap.h"
 #include "i_system.h"
diff --git a/src/i_sdlmusic.c b/src/i_sdlmusic.c
index 63a3467a..6acb528f 100644
--- a/src/i_sdlmusic.c
+++ b/src/i_sdlmusic.c
@@ -20,6 +20,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
+
 #include "SDL.h"
 #include "SDL_mixer.h"
 
diff --git a/src/i_video.c b/src/i_video.c
index 8fb1f178..d0140a0b 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -479,9 +479,7 @@ static int TranslateKey(SDL_keysym *sym)
 
       case SDLK_PAUSE:	return KEY_PAUSE;
 
-#if !SDL_VERSION_ATLEAST(1, 3, 0)
       case SDLK_EQUALS: return KEY_EQUALS;
-#endif
 
       case SDLK_MINUS:          return KEY_MINUS;
 
@@ -495,10 +493,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;
@@ -829,11 +825,7 @@ static void CenterMouse(void)
     // Clear any relative movement caused by warping
 
     SDL_PumpEvents();
-#if SDL_VERSION_ATLEAST(1, 3, 0)
-    SDL_GetRelativeMouseState(0, NULL, NULL);
-#else
     SDL_GetRelativeMouseState(NULL, NULL);
-#endif
 }
 
 //
@@ -847,11 +839,7 @@ static void I_ReadMouse(void)
     int x, y;
     event_t ev;
 
-#if SDL_VERSION_ATLEAST(1, 3, 0)
-    SDL_GetRelativeMouseState(0, &x, &y);
-#else
     SDL_GetRelativeMouseState(&x, &y);
-#endif
 
     if (x != 0 || y != 0) 
     {
@@ -2023,9 +2011,7 @@ void I_InitGraphics(void)
     // has to be done before the call to SDL_SetVideoMode.
 
     I_InitWindowTitle();
-#if !SDL_VERSION_ATLEAST(1, 3, 0)
     I_InitWindowIcon();
-#endif
 
     // Warning to OS X users... though they might never see it :(
 #ifdef __MACOSX__
diff --git a/src/setup/execute.c b/src/setup/execute.c
index bbb23c38..26f59fd8 100644
--- a/src/setup/execute.c
+++ b/src/setup/execute.c
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 #include <sys/types.h>
 
diff --git a/src/setup/joystick.c b/src/setup/joystick.c
index dbd7815c..db4ad258 100644
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -14,6 +14,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "doomtype.h"
 #include "i_joystick.h"
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;
 
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 <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
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 <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 #include "doomkeys.h"