From 2b6907e0abac51d2960fcfa7213813d8fb4b257f Mon Sep 17 00:00:00 2001 From: pinumbernumber <1337rz@gmail.com> Date: Tue, 27 Aug 2013 19:26:01 +0100 Subject: [PATCH] fix C++ (MSVC) build --- input/dinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/dinput.c b/input/dinput.c index f71d690ae0..989279df5c 100644 --- a/input/dinput.c +++ b/input/dinput.c @@ -443,7 +443,7 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p) return DIENUM_CONTINUE; size_t name_len = strlen(inst->tszProductName) + 1; - g_pad_names[g_joypad_cnt] = malloc(name_len); + g_pad_names[g_joypad_cnt] = (char*)malloc(name_len); strncpy(g_pad_names[g_joypad_cnt], inst->tszProductName, name_len); #ifdef HAVE_WINXINPUT