From 296a89b1a64275b7ba59908df92d73608e394074 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 16 Feb 2022 11:05:21 +0800
Subject: [PATCH] update: libusb.h include path

---
 DSView/pv/mainwindow.cpp              | 2 +-
 DSView/pv/toolbars/samplingbar.cpp    | 2 +-
 libsigrok4DSL/hardware/common/ezusb.c | 1 -
 libsigrok4DSL/hardware/common/usb.c   | 1 -
 libsigrok4DSL/libsigrok-internal.h    | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index 4722a808..a9360a03 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -41,7 +41,7 @@
 #include <QStandardPaths>
 #include <QScreen>
 #include <QTimer>
-#include <libusb.h>
+#include <libusb-1.0/libusb.h>
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #include <QGuiApplication>
diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp
index 2cabd664..ac91bc4c 100755
--- a/DSView/pv/toolbars/samplingbar.cpp
+++ b/DSView/pv/toolbars/samplingbar.cpp
@@ -28,7 +28,7 @@
 #include <QLabel>
 #include <QAbstractItemView>
 #include <math.h>
-#include <libusb.h>
+#include <libusb-1.0/libusb.h>
 
 #include "../devicemanager.h"
 #include "../device/devinst.h"
diff --git a/libsigrok4DSL/hardware/common/ezusb.c b/libsigrok4DSL/hardware/common/ezusb.c
index 803f01e4..5f043ea9 100755
--- a/libsigrok4DSL/hardware/common/ezusb.c
+++ b/libsigrok4DSL/hardware/common/ezusb.c
@@ -22,7 +22,6 @@
  */
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
-//#include <libusb.h>
 #include <glib-2.0/glib.h>
 #include <glib/gstdio.h>
 #include <stdio.h>
diff --git a/libsigrok4DSL/hardware/common/usb.c b/libsigrok4DSL/hardware/common/usb.c
index f5958118..379ffd73 100755
--- a/libsigrok4DSL/hardware/common/usb.c
+++ b/libsigrok4DSL/hardware/common/usb.c
@@ -21,7 +21,6 @@
 #include "../../libsigrok-internal.h"
 #include <stdlib.h>
 #include <glib-2.0/glib.h>
-//#include <libusb.h>
 
 /* SR_CONF_CONN takes one of these: */
 #define CONN_USB_VIDPID  "^([0-9a-z]{4})\\.([0-9a-z]{4})$"
diff --git a/libsigrok4DSL/libsigrok-internal.h b/libsigrok4DSL/libsigrok-internal.h
index 9c899880..063ffb60 100755
--- a/libsigrok4DSL/libsigrok-internal.h
+++ b/libsigrok4DSL/libsigrok-internal.h
@@ -24,7 +24,7 @@
 #include <glib-2.0/glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #ifdef HAVE_LIBUSB_1_0
-#include <libusb.h>
+#include <libusb-1.0/libusb.h>
 #endif
 
 // firmware binary file directory, endswith letter '/'