From ddc0727bba6f76406af5d3beeb44be8be0a4ebdb Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 27 Oct 2020 09:00:42 -0700 Subject: [PATCH] Fixed implicit memcpy() when building for ARM64 on Windows (thanks Seigo!) --- src/joystick/windows/SDL_dinputjoystick.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/joystick/windows/SDL_dinputjoystick.c b/src/joystick/windows/SDL_dinputjoystick.c index 1a042ab38..5900a96db 100644 --- a/src/joystick/windows/SDL_dinputjoystick.c +++ b/src/joystick/windows/SDL_dinputjoystick.c @@ -601,8 +601,8 @@ EnumJoysticksCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext) pPrevJoystick->pNext = pNewJoystick->pNext; } - // Update with new guid/etc, if it has changed - pNewJoystick->dxdevice = *pdidInstance; + /* Update with new guid/etc, if it has changed */ + SDL_memcpy(&pNewJoystick->dxdevice, pdidInstance, sizeof(DIDEVICEINSTANCE)); pNewJoystick->pNext = SYS_Joystick; SYS_Joystick = pNewJoystick;