mirror of
https://github.com/libsdl-org/SDL.git
synced 2026-05-30 21:37:43 +08:00
Fixed conflict when linking both SDL and hidapi statically
Fixes https://github.com/libsdl-org/SDL/issues/12790
(cherry picked from commit 98e76d283f)
This commit is contained in:
@@ -62,6 +62,10 @@
|
|||||||
#define wcsstr SDL_wcsstr
|
#define wcsstr SDL_wcsstr
|
||||||
#define wcstol SDL_wcstol
|
#define wcstol SDL_wcstol
|
||||||
|
|
||||||
|
// These functions conflict when linking both SDL and hidapi statically
|
||||||
|
#define hid_winapi_descriptor_reconstruct_pp_data SDL_hid_winapi_descriptor_reconstruct_pp_data
|
||||||
|
#define hid_winapi_get_container_id SDL_hid_winapi_get_container_id
|
||||||
|
|
||||||
#undef HIDAPI_H__
|
#undef HIDAPI_H__
|
||||||
#include "windows/hid.c"
|
#include "windows/hid.c"
|
||||||
#define HAVE_PLATFORM_BACKEND 1
|
#define HAVE_PLATFORM_BACKEND 1
|
||||||
|
|||||||
Reference in New Issue
Block a user