encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hidapi/windows/hid.c: comment out ntdef.h include after windows.h. 

not necessary and can cause redefinition errors in some toolchains.
This commit is contained in:
Ozkan Sezer 2018-09-28 13:44:10 +03:00
parent b11c75e9f4
commit cf7d64f266
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,10 +22,7 @@
#include <windows.h> #include <windows.h>
#ifndef _NTDEF_ #if 0 /* can cause redefinition errors on some toolchains */
typedef LONG NTSTATUS;
#endif
#ifdef __MINGW32__ #ifdef __MINGW32__
#include <ntdef.h> #include <ntdef.h>
#include <winbase.h> #include <winbase.h>
@ -35,6 +32,11 @@ typedef LONG NTSTATUS;
#include <ntdef.h> #include <ntdef.h>
#define _wcsdup wcsdup #define _wcsdup wcsdup
#endif #endif
#endif /* */
#ifndef _NTDEF_
typedef LONG NTSTATUS;
#endif
/* SDL C runtime functions */ /* SDL C runtime functions */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
@ -906,7 +908,6 @@ int HID_API_EXPORT_CALL HID_API_CALL hid_get_indexed_string(hid_device *dev, int
return 0; return 0;
} }
HID_API_EXPORT const wchar_t * HID_API_CALL hid_error(hid_device *dev) HID_API_EXPORT const wchar_t * HID_API_CALL hid_error(hid_device *dev)
{ {
return (wchar_t*)dev->last_error_str; return (wchar_t*)dev->last_error_str;
@ -918,7 +919,7 @@ HID_API_EXPORT const wchar_t * HID_API_CALL hid_error(hid_device *dev)
/*#define PICPGM*/ /*#define PICPGM*/
/*#define S11*/ /*#define S11*/
#define P32 #define P32
#ifdef S11 #ifdef S11
unsigned short VendorID = 0xa0a0; unsigned short VendorID = 0xa0a0;
unsigned short ProductID = 0x0001; unsigned short ProductID = 0x0001;
#endif #endif
@ -928,7 +929,6 @@ HID_API_EXPORT const wchar_t * HID_API_CALL hid_error(hid_device *dev)
unsigned short ProductID = 0x3f; unsigned short ProductID = 0x3f;
#endif #endif
#ifdef PICPGM #ifdef PICPGM
unsigned short VendorID = 0x04d8; unsigned short VendorID = 0x04d8;
unsigned short ProductID = 0x0033; unsigned short ProductID = 0x0033;