From b15e880e73cc6a8e3f7c73ea8e61346d39096ccf Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 11 Nov 2021 13:50:16 -0800 Subject: [PATCH] Fixed open functions in the SDL_hidapi.h header --- include/SDL_hidapi.h | 4 ++-- src/dynapi/SDL_dynapi_overrides.h | 2 ++ src/dynapi/SDL_dynapi_procs.h | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/SDL_hidapi.h b/include/SDL_hidapi.h index 7ce86b895..ad6f1ea99 100644 --- a/include/SDL_hidapi.h +++ b/include/SDL_hidapi.h @@ -226,7 +226,7 @@ extern DECLSPEC void SDLCALL SDL_hid_free_enumeration(SDL_hid_device_info *devs) * * \since This function is available since SDL 2.0.18. */ -SDL_hid_device * SDL_hid_open(unsigned short vendor_id, unsigned short product_id, const wchar_t *serial_number); +extern DECLSPEC SDL_hid_device * SDLCALL SDL_hid_open(unsigned short vendor_id, unsigned short product_id, const wchar_t *serial_number); /** * Open a HID device by its path name. @@ -241,7 +241,7 @@ SDL_hid_device * SDL_hid_open(unsigned short vendor_id, unsigned short product_i * * \since This function is available since SDL 2.0.18. */ -SDL_hid_device * SDL_hid_open_path(const char *path, int bExclusive /* = false */); +extern DECLSPEC SDL_hid_device * SDLCALL SDL_hid_open_path(const char *path, int bExclusive /* = false */); /** * Write an Output report to a HID device. diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h index 8a9f43f84..e03b6bf2d 100644 --- a/src/dynapi/SDL_dynapi_overrides.h +++ b/src/dynapi/SDL_dynapi_overrides.h @@ -847,3 +847,5 @@ #define SDL_RenderWindowToLogical SDL_RenderWindowToLogical_REAL #define SDL_RenderLogicalToWindow SDL_RenderLogicalToWindow_REAL #define SDL_hid_device_change_count SDL_hid_device_change_count_REAL +#define SDL_hid_open SDL_hid_open_REAL +#define SDL_hid_open_path SDL_hid_open_path_REAL diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h index d6c289c91..ae7a18366 100644 --- a/src/dynapi/SDL_dynapi_procs.h +++ b/src/dynapi/SDL_dynapi_procs.h @@ -916,3 +916,5 @@ SDL_DYNAPI_PROC(const SDL_Rect*,SDL_GetWindowMouseRect,(SDL_Window *a),(a),retur SDL_DYNAPI_PROC(void,SDL_RenderWindowToLogical,(SDL_Renderer *a, int b, int c, float *d, float *e),(a,b,c,d,e),) SDL_DYNAPI_PROC(void,SDL_RenderLogicalToWindow,(SDL_Renderer *a, float b, float c, int *d, int *e),(a,b,c,d,e),) SDL_DYNAPI_PROC(Uint32,SDL_hid_device_change_count,(void),(),return) +SDL_DYNAPI_PROC(SDL_hid_device*,SDL_hid_open,(unsigned short a, unsigned short b, const wchar_t *c),(a,b,c),return) +SDL_DYNAPI_PROC(SDL_hid_device*,SDL_hid_open_path,(const char *a, int b),(a,b),return)