From 20c846ebe7977c6971444d81043429d4a1679cfe Mon Sep 17 00:00:00 2001
From: Philipp Wiesemann <philipp.wiesemann@arcor.de>
Date: Sat, 4 Mar 2017 23:05:47 +0100
Subject: [PATCH] Fixed warning about implicit conversion in controllermap
 program.

---
 test/controllermap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/controllermap.c b/test/controllermap.c
index b90149b026a33..c4fe5929c3ade 100644
--- a/test/controllermap.c
+++ b/test/controllermap.c
@@ -409,7 +409,7 @@ WatchJoystick(SDL_Joystick * joystick)
     nJoystickID = SDL_JoystickInstanceID(joystick);
 
     s_nNumAxes = SDL_JoystickNumAxes(joystick);
-    s_arrAxisState = SDL_calloc(s_nNumAxes, sizeof(*s_arrAxisState));
+    s_arrAxisState = (AxisState *)SDL_calloc(s_nNumAxes, sizeof(*s_arrAxisState));
     for (iIndex = 0; iIndex < s_nNumAxes; ++iIndex) {
         AxisState *pAxisState = &s_arrAxisState[iIndex];
         Sint16 nInitialValue;