gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move diagnostic pragma out of the function for old gcc versions.

Browse Source
This commit is contained in:
Ozkan Sezer
2023-05-27 18:40:56 +03:00
parent 211054d9db
commit 8ea76ba116
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/hidapi/windows/hid.c
View File

@@ -1375,17 +1375,14 @@ int HID_API_EXPORT HID_API_CALL hid_get_input_report(hid_device *dev, unsigned c
return hid_get_report(dev, IOCTL_HID_GET_INPUT_REPORT, data, length); return hid_get_report(dev, IOCTL_HID_GET_INPUT_REPORT, data, length);
} }
void HID_API_EXPORT HID_API_CALL hid_close(hid_device *dev)
{
#if defined(__GNUC__) #if defined(__GNUC__)
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wcast-function-type" # pragma GCC diagnostic ignored "-Wcast-function-type"
#endif #endif
void HID_API_EXPORT HID_API_CALL hid_close(hid_device *dev)
{
typedef BOOL (WINAPI *CancelIoEx_t)(HANDLE hFile, LPOVERLAPPED lpOverlapped); typedef BOOL (WINAPI *CancelIoEx_t)(HANDLE hFile, LPOVERLAPPED lpOverlapped);
CancelIoEx_t CancelIoExFunc = (CancelIoEx_t)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "CancelIoEx"); CancelIoEx_t CancelIoExFunc = (CancelIoEx_t)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "CancelIoEx");
#if defined(__GNUC__)
# pragma GCC diagnostic pop
#endif
if (!dev) if (!dev)
return; return;
@@ -1398,11 +1395,13 @@ void HID_API_EXPORT HID_API_CALL hid_close(hid_device *dev)
} }
if (dev->read_pending) { if (dev->read_pending) {
DWORD bytes_read = 0; DWORD bytes_read = 0;
GetOverlappedResult(dev->device_handle, &dev->ol, &bytes_read, TRUE/*wait*/); GetOverlappedResult(dev->device_handle, &dev->ol, &bytes_read, TRUE/*wait*/);
} }
free_hid_device(dev); free_hid_device(dev);
} }
#if defined(__GNUC__)
# pragma GCC diagnostic pop
#endif
int HID_API_EXPORT_CALL HID_API_CALL hid_get_manufacturer_string(hid_device *dev, wchar_t *string, size_t maxlen) int HID_API_EXPORT_CALL HID_API_CALL hid_get_manufacturer_string(hid_device *dev, wchar_t *string, size_t maxlen)
{ {