From 4edbf3683687c19fb6eb9ccae4b32fdd7657c56f Mon Sep 17 00:00:00 2001
From: Michael Martin <mcmartin@gmail.com>
Date: Sun, 25 Aug 2019 00:33:00 -0700
Subject: [PATCH] Fix the remaining non-unicode version issues in the input
 library

---
 sc2/src/libs/input/sdl/input.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sc2/src/libs/input/sdl/input.c b/sc2/src/libs/input/sdl/input.c
index 6e6d35430..8d9e7b447 100644
--- a/sc2/src/libs/input/sdl/input.c
+++ b/sc2/src/libs/input/sdl/input.c
@@ -242,7 +242,12 @@ TFB_InitInput (int driver, int flags)
 		log_add (log_Info, "The names of the joysticks are:");
 		for (i = 0; i < nJoysticks; i++)
 		{
-			log_add (log_Info, "    %s", SDL_JoystickName (i));
+			log_add (log_Info, "    %s",
+#if SDL_MAJOR_VERSION == 1
+					SDL_JoystickName (i));
+#else
+					SDL_JoystickNameForIndex (i));
+#endif
 		}
 		SDL_JoystickEventState (SDL_ENABLE);
 	}