Merge pull request #5 from awson/master

Build hidapi against latest mingw-w64 headers
supercollider · Feb 13, 2017 · 7ec3943 · 7ec3943
2 parents 6666789 + 23ab8e2
commit 7ec3943
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/hidapi_parser/hidapi_parser.c b/hidapi_parser/hidapi_parser.c
@@ -29,12 +29,11 @@
 
 #ifdef _WIN32
 #include <windows.h>
-#ifdef __MINGW32__
-#include "../windows/hidsdi.h"
-#else
+// for MinGW < 5.3 include locally provided "../windows hidsdi.h" rather
+// than #include <hidsdi.h>:
+// #include "../windows/hidsdi.h"
 #include <hidsdi.h>
 #endif
-#endif
 
 #include "hidapi_parser.h"
 

diff --git a/windows/hid.c b/windows/hid.c
@@ -21,12 +21,10 @@
 ********************************************************/
 
 #include <windows.h>
-
-#ifdef __MINGW32__
-#include "./hidsdi.h"
-#else
+// for MinGW < 5.3 include locally provided "../windows hidsdi.h" rather
+// than #include <hidsdi.h>:
+// #include "./hidsdi.h"
 #include <hidsdi.h>
-#endif
 
 #ifndef _NTDEF_
 typedef LONG NTSTATUS;
@@ -35,6 +33,7 @@ typedef LONG NTSTATUS;
 #ifdef __MINGW32__
 #include <ntdef.h>
 #include <winbase.h>
+#include <devpropdef.h>
 #endif
 
 #ifdef __CYGWIN__