From 1f77d74803e3bd6bde831937b1110512017d39a5 Mon Sep 17 00:00:00 2001
From: Daniel Beer <dlbeer@gmail.com>
Date: Wed, 21 Dec 2016 09:57:23 +1300
Subject: [PATCH] Windows compatibility fixes.

Supplied and tested by Patrick Dussud <phdussud@hotmail.com>.
---
 transport/bslhid.c  | 4 ++++
 transport/cdc_acm.c | 5 +++++
 transport/cp210x.c  | 6 ++++++
 transport/rf2500.c  | 4 ++++
 transport/ti3410.c  | 5 +++++
 util/sport.h        | 2 +-
 util/usbutil.h      | 4 ++++
 7 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/transport/bslhid.c b/transport/bslhid.c
index b98abc5..f8a9f73 100644
--- a/transport/bslhid.c
+++ b/transport/bslhid.c
@@ -16,7 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef __Windows__
 #include <usb.h>
+#else
+#include <lusb0_usb.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
diff --git a/transport/cdc_acm.c b/transport/cdc_acm.c
index 039850d..d586816 100644
--- a/transport/cdc_acm.c
+++ b/transport/cdc_acm.c
@@ -19,7 +19,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifndef __Windows__
 #include <usb.h>
+#else
+#include <lusb0_usb.h>
+#endif
 
 #include "cdc_acm.h"
 #include "util.h"
diff --git a/transport/cp210x.c b/transport/cp210x.c
index 28ce70b..830c063 100644
--- a/transport/cp210x.c
+++ b/transport/cp210x.c
@@ -20,7 +20,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifndef __Windows__
 #include <usb.h>
+#else
+#include <lusb0_usb.h>
+#endif
+
 #include <time.h>
 
 #include "cp210x.h"
diff --git a/transport/rf2500.c b/transport/rf2500.c
index 281cf2f..468ebe4 100644
--- a/transport/rf2500.c
+++ b/transport/rf2500.c
@@ -19,7 +19,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef __Windows__
 #include <usb.h>
+#else
+#include <lusb0_usb.h>
+#endif
 
 #include "rf2500.h"
 #include "util.h"
diff --git a/transport/ti3410.c b/transport/ti3410.c
index 4c057ee..8092e01 100644
--- a/transport/ti3410.c
+++ b/transport/ti3410.c
@@ -20,7 +20,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#ifndef __Windows__
 #include <usb.h>
+#else
+#include <lusb0_usb.h>
+#endif
+
 #include <time.h>
 
 #include "ti3410.h"
diff --git a/util/sport.h b/util/sport.h
index 3164185..06a4165 100644
--- a/util/sport.h
+++ b/util/sport.h
@@ -20,9 +20,9 @@
 #define SPORT_H_
 
 #include <stdint.h>
-
 #ifndef __Windows__
 
+
 #include <termios.h>
 #include <sys/ioctl.h>
 
diff --git a/util/usbutil.h b/util/usbutil.h
index 3573ffc..c168652 100644
--- a/util/usbutil.h
+++ b/util/usbutil.h
@@ -19,7 +19,11 @@
 #ifndef USBUTIL_H_
 #define USBUTIL_H_
 
+#ifndef __Windows__
 #include <usb.h>
+#else
+#include <lusb0_usb.h>
+#endif
 
 /* List all available USB devices. */
 void usbutil_list(void);