ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-03-23 21:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

hidapi: Explicitly include locale.h, for setlocale

Browse source
This commit is contained in:
Ethan Lee 2019-08-06 23:08:01 -04:00
parent 2a1adf71ab
commit c76f0f5b6b
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/hidapi/libusb/hid.c
View file

@ -34,6 +34,7 @@
#ifdef SDL_JOYSTICK_HIDAPI #ifdef SDL_JOYSTICK_HIDAPI
#include <libusb.h> #include <libusb.h>
#include <locale.h> /* setlocale */
#include "hidapi.h" #include "hidapi.h"
@ -452,20 +453,16 @@ static char *make_path(libusb_device *dev, int interface_number)
int HID_API_EXPORT hid_init(void) int HID_API_EXPORT hid_init(void)
{ {
if (!usb_context) { if (!usb_context) {
#ifndef _WIN32 /* TODO: Win32 setlocale */
const char *locale; const char *locale;
#endif /* _WIN32 */
/* Init Libusb */ /* Init Libusb */
if (libusb_init(&usb_context)) if (libusb_init(&usb_context))
return -1; return -1;
#ifndef _WIN32 /* TODO: Win32 setlocale */
/* Set the locale if it's not set. */ /* Set the locale if it's not set. */
locale = setlocale(LC_CTYPE, NULL); locale = setlocale(LC_CTYPE, NULL);
if (!locale) if (!locale)
setlocale(LC_CTYPE, ""); setlocale(LC_CTYPE, "");
#endif /* _WIN32 */
} }
return 0; return 0;
@ -1357,7 +1354,6 @@ struct lang_map_entry {
uint16_t usb_code; uint16_t usb_code;
}; };
#ifndef _WIN32 /* TODO: Win32 setlocale */
#define LANG(name,code,usb_code) { name, code, usb_code } #define LANG(name,code,usb_code) { name, code, usb_code }
static struct lang_map_entry lang_map[] = { static struct lang_map_entry lang_map[] = {
LANG("Afrikaans", "af", 0x0436), LANG("Afrikaans", "af", 0x0436),
@ -1495,11 +1491,9 @@ static struct lang_map_entry lang_map[] = {
LANG("Zulu", "zu", 0x0435), LANG("Zulu", "zu", 0x0435),
LANG(NULL, NULL, 0x0), LANG(NULL, NULL, 0x0),
}; };
#endif /* _WIN32 */
uint16_t get_usb_code_for_current_locale(void) uint16_t get_usb_code_for_current_locale(void)
{ {
#ifndef _WIN32 /* TODO: Win32 setlocale? */
char *locale; char *locale;
char search_string[64]; char search_string[64];
char *ptr; char *ptr;
@ -1557,7 +1551,6 @@ uint16_t get_usb_code_for_current_locale(void)
} }
#endif #endif
#endif /* _WIN32 */
/* Found nothing. */ /* Found nothing. */
return 0x0; return 0x0;
} }