Revert SDL2 - joystick battery test definition clashes
Revert SDL2 - joystick battery test definition clashes

Warblefly/MultimediaTools-mingw-w64,Warblefly/MultimediaTools-mingw-w64,Warblefly/MultimediaTools-mingw-w64,Warblefly/MultimediaTools-mingw-w64