From d9ff0bf7283a8cad8ce7a11939a2c6906812e4a5 Mon Sep 17 00:00:00 2001
From: dreamsourcelabTAI <tzz@dreamsourcelab.com>
Date: Wed, 16 Feb 2022 11:37:06 +0800
Subject: [PATCH] update: glib.h include path

---
 DSView/pv/data/decode/decoder.h       | 2 +-
 DSView/pv/device/devinst.h            | 2 +-
 DSView/pv/devicemanager.h             | 2 +-
 DSView/pv/mainwindow.cpp              | 2 +-
 DSView/pv/prop/binding/binding.h      | 2 +-
 DSView/pv/prop/property.h             | 2 +-
 libsigrok4DSL/backend.c               | 2 +-
 libsigrok4DSL/dsdevice.c              | 2 +-
 libsigrok4DSL/hardware/DSL/command.h  | 2 +-
 libsigrok4DSL/hardware/DSL/dsl.h      | 2 +-
 libsigrok4DSL/hardware/common/ezusb.c | 2 +-
 libsigrok4DSL/hardware/common/usb.c   | 2 +-
 libsigrok4DSL/hardware/demo/demo.h    | 2 +-
 libsigrok4DSL/hwdriver.c              | 2 +-
 libsigrok4DSL/input/in_vcd.c          | 2 +-
 libsigrok4DSL/libsigrok-internal.h    | 2 +-
 libsigrok4DSL/libsigrok.h             | 2 +-
 libsigrok4DSL/output/csv.c            | 2 +-
 libsigrok4DSL/output/gnuplot.c        | 2 +-
 libsigrok4DSL/output/srzip.c          | 2 +-
 libsigrok4DSL/output/vcd.c            | 2 +-
 libsigrok4DSL/session.c               | 2 +-
 libsigrok4DSL/session_file.c          | 2 +-
 libsigrok4DSL/std.c                   | 2 +-
 libsigrok4DSL/trigger.c               | 2 +-
 libsigrokdecode4DSL/decoder.c         | 2 +-
 libsigrokdecode4DSL/exception.c       | 2 +-
 libsigrokdecode4DSL/instance.c        | 2 +-
 libsigrokdecode4DSL/libsigrokdecode.h | 2 +-
 libsigrokdecode4DSL/session.c         | 2 +-
 libsigrokdecode4DSL/srd.c             | 2 +-
 31 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/DSView/pv/data/decode/decoder.h b/DSView/pv/data/decode/decoder.h
index 751535cb..1f737f90 100755
--- a/DSView/pv/data/decode/decoder.h
+++ b/DSView/pv/data/decode/decoder.h
@@ -28,7 +28,7 @@
 #include <sstream>
 #include <iostream>
   
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 struct srd_decoder;
 struct srd_decoder_inst;
diff --git a/DSView/pv/device/devinst.h b/DSView/pv/device/devinst.h
index 8a2b9eb8..83b1a884 100755
--- a/DSView/pv/device/devinst.h
+++ b/DSView/pv/device/devinst.h
@@ -25,7 +25,7 @@
 #include <QObject>
 
 #include <string>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <stdint.h>
 
 #include <libsigrok4DSL/libsigrok.h>
diff --git a/DSView/pv/devicemanager.h b/DSView/pv/devicemanager.h
index f4eee0e1..c8b85b63 100755
--- a/DSView/pv/devicemanager.h
+++ b/DSView/pv/devicemanager.h
@@ -24,7 +24,7 @@
 #ifndef DSVIEW_PV_DEVICEMANAGER_H
 #define DSVIEW_PV_DEVICEMANAGER_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 #include <list>
 #include <map>
diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
index a9360a03..87a0da61 100644
--- a/DSView/pv/mainwindow.cpp
+++ b/DSView/pv/mainwindow.cpp
@@ -86,7 +86,7 @@
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdarg.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <list>
 #include "ui/msgbox.h"
 #include "config/appconfig.h"
diff --git a/DSView/pv/prop/binding/binding.h b/DSView/pv/prop/binding/binding.h
index d8ec5ebf..68bae0d7 100755
--- a/DSView/pv/prop/binding/binding.h
+++ b/DSView/pv/prop/binding/binding.h
@@ -24,7 +24,7 @@
 #ifndef DSVIEW_PV_PROP_BINDING_BINDING_H
 #define DSVIEW_PV_PROP_BINDING_BINDING_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 #include <vector>
 #include <map> 
diff --git a/DSView/pv/prop/property.h b/DSView/pv/prop/property.h
index 56f5f126..5ba344be 100755
--- a/DSView/pv/prop/property.h
+++ b/DSView/pv/prop/property.h
@@ -23,7 +23,7 @@
 #ifndef DSVIEW_PV_PROP_PROPERTY_H
 #define DSVIEW_PV_PROP_PROPERTY_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 #include <boost/function.hpp>
 
diff --git a/libsigrok4DSL/backend.c b/libsigrok4DSL/backend.c
index e58314a3..156922f5 100755
--- a/libsigrok4DSL/backend.c
+++ b/libsigrok4DSL/backend.c
@@ -20,7 +20,7 @@
 
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 
 /**
diff --git a/libsigrok4DSL/dsdevice.c b/libsigrok4DSL/dsdevice.c
index db6473b1..213a91db 100755
--- a/libsigrok4DSL/dsdevice.c
+++ b/libsigrok4DSL/dsdevice.c
@@ -20,7 +20,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include <stdio.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 
 /* Message logging helpers with subsystem-specific prefix string. */
diff --git a/libsigrok4DSL/hardware/DSL/command.h b/libsigrok4DSL/hardware/DSL/command.h
index ef507bdb..a5647638 100755
--- a/libsigrok4DSL/hardware/DSL/command.h
+++ b/libsigrok4DSL/hardware/DSL/command.h
@@ -20,7 +20,7 @@
 #ifndef LIBDSL_HARDWARE_COMMAND_H
 #define LIBDSL_HARDWARE_COMMAND_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
 
diff --git a/libsigrok4DSL/hardware/DSL/dsl.h b/libsigrok4DSL/hardware/DSL/dsl.h
index ea412407..9f9fe95f 100755
--- a/libsigrok4DSL/hardware/DSL/dsl.h
+++ b/libsigrok4DSL/hardware/DSL/dsl.h
@@ -21,7 +21,7 @@
 #ifndef LIBDSL_HARDWARE_DSL_H
 #define LIBDSL_HARDWARE_DSL_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
 #include "command.h"
diff --git a/libsigrok4DSL/hardware/common/ezusb.c b/libsigrok4DSL/hardware/common/ezusb.c
index 5f043ea9..584c0bfd 100755
--- a/libsigrok4DSL/hardware/common/ezusb.c
+++ b/libsigrok4DSL/hardware/common/ezusb.c
@@ -22,7 +22,7 @@
  */
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/libsigrok4DSL/hardware/common/usb.c b/libsigrok4DSL/hardware/common/usb.c
index 379ffd73..5f327c64 100755
--- a/libsigrok4DSL/hardware/common/usb.c
+++ b/libsigrok4DSL/hardware/common/usb.c
@@ -20,7 +20,7 @@
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
 #include <stdlib.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /* SR_CONF_CONN takes one of these: */
 #define CONN_USB_VIDPID  "^([0-9a-z]{4})\\.([0-9a-z]{4})$"
diff --git a/libsigrok4DSL/hardware/demo/demo.h b/libsigrok4DSL/hardware/demo/demo.h
index cfaaad76..e347401f 100755
--- a/libsigrok4DSL/hardware/demo/demo.h
+++ b/libsigrok4DSL/hardware/demo/demo.h
@@ -21,7 +21,7 @@
 #ifndef LIBDSL_HARDWARE_DEMO_H
 #define LIBDSL_HARDWARE_DEMO_H
 
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "../../libsigrok.h"
 #include "../../libsigrok-internal.h"
 
diff --git a/libsigrok4DSL/hwdriver.c b/libsigrok4DSL/hwdriver.c
index 6ce05185..7ce483ac 100755
--- a/libsigrok4DSL/hwdriver.c
+++ b/libsigrok4DSL/hwdriver.c
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <string.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 
 #include "hardware/DSL/dsl.h"
diff --git a/libsigrok4DSL/input/in_vcd.c b/libsigrok4DSL/input/in_vcd.c
index dda2f46a..a19146a5 100755
--- a/libsigrok4DSL/input/in_vcd.c
+++ b/libsigrok4DSL/input/in_vcd.c
@@ -60,7 +60,7 @@
 #include "../libsigrok.h"
 #include "../libsigrok-internal.h"
 #include <stdlib.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/libsigrok4DSL/libsigrok-internal.h b/libsigrok4DSL/libsigrok-internal.h
index 063ffb60..dafe2fb4 100755
--- a/libsigrok4DSL/libsigrok-internal.h
+++ b/libsigrok4DSL/libsigrok-internal.h
@@ -21,7 +21,7 @@
 #define LIBSIGROK_SIGROK_INTERNAL_H
 
 //#include <stdarg.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #ifdef HAVE_LIBUSB_1_0
 #include <libusb-1.0/libusb.h>
diff --git a/libsigrok4DSL/libsigrok.h b/libsigrok4DSL/libsigrok.h
index 70eb4055..f997aea1 100755
--- a/libsigrok4DSL/libsigrok.h
+++ b/libsigrok4DSL/libsigrok.h
@@ -26,7 +26,7 @@
 #include <sys/time.h>
 #include <stdint.h>
 #include <inttypes.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <zip.h>
 
 #ifdef __cplusplus
diff --git a/libsigrok4DSL/output/csv.c b/libsigrok4DSL/output/csv.c
index 07bb09d5..4aa398a5 100755
--- a/libsigrok4DSL/output/csv.c
+++ b/libsigrok4DSL/output/csv.c
@@ -22,7 +22,7 @@
 #include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "../config.h" /* Needed for PACKAGE_STRING and others. */
 
 #define LOG_PREFIX "output/csv"
diff --git a/libsigrok4DSL/output/gnuplot.c b/libsigrok4DSL/output/gnuplot.c
index 56b6d5fd..e39c1d4c 100755
--- a/libsigrok4DSL/output/gnuplot.c
+++ b/libsigrok4DSL/output/gnuplot.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <inttypes.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "../config.h" /* Needed for PACKAGE_STRING and others. */
 
 #define LOG_PREFIX "output/gnuplot"
diff --git a/libsigrok4DSL/output/srzip.c b/libsigrok4DSL/output/srzip.c
index 0e195e2b..f723ce69 100755
--- a/libsigrok4DSL/output/srzip.c
+++ b/libsigrok4DSL/output/srzip.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 #include <zip.h>
 
diff --git a/libsigrok4DSL/output/vcd.c b/libsigrok4DSL/output/vcd.c
index ead5c932..37a5a9af 100755
--- a/libsigrok4DSL/output/vcd.c
+++ b/libsigrok4DSL/output/vcd.c
@@ -23,7 +23,7 @@
 #include "../libsigrok-internal.h"
 #include <stdlib.h>
 #include <string.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include "../config.h" /* Needed for PACKAGE and others. */
 
 #define LOG_PREFIX "output/vcd"
diff --git a/libsigrok4DSL/session.c b/libsigrok4DSL/session.c
index 3cf69419..24786c07 100755
--- a/libsigrok4DSL/session.c
+++ b/libsigrok4DSL/session.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /* Message logging helpers with subsystem-specific prefix string. */
 #define LOG_PREFIX "session: "
diff --git a/libsigrok4DSL/session_file.c b/libsigrok4DSL/session_file.c
index 73eea479..ec76d4a5 100755
--- a/libsigrok4DSL/session_file.c
+++ b/libsigrok4DSL/session_file.c
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 #include "config.h" /* Needed for PACKAGE_VERSION and others. */
 
diff --git a/libsigrok4DSL/std.c b/libsigrok4DSL/std.c
index 29db62c0..8a04fe99 100755
--- a/libsigrok4DSL/std.c
+++ b/libsigrok4DSL/std.c
@@ -20,7 +20,7 @@
 
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /**
  * Standard sr_driver_init() API helper.
diff --git a/libsigrok4DSL/trigger.c b/libsigrok4DSL/trigger.c
index 9c119ccf..c9d08c45 100755
--- a/libsigrok4DSL/trigger.c
+++ b/libsigrok4DSL/trigger.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <assert.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /* Message logging helpers with subsystem-specific prefix string. */
 #define LOG_PREFIX "session: "
diff --git a/libsigrokdecode4DSL/decoder.c b/libsigrokdecode4DSL/decoder.c
index 46f0f3bd..809cb25b 100755
--- a/libsigrokdecode4DSL/decoder.c
+++ b/libsigrokdecode4DSL/decoder.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /**
  * @file
diff --git a/libsigrokdecode4DSL/exception.c b/libsigrokdecode4DSL/exception.c
index b71d4c35..e8c20633 100755
--- a/libsigrokdecode4DSL/exception.c
+++ b/libsigrokdecode4DSL/exception.c
@@ -21,7 +21,7 @@
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
 #include <stdarg.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 static char *py_stringify(PyObject *py_obj)
 {
diff --git a/libsigrokdecode4DSL/instance.c b/libsigrokdecode4DSL/instance.c
index 295ec1ff..1b3d5df7 100755
--- a/libsigrokdecode4DSL/instance.c
+++ b/libsigrokdecode4DSL/instance.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
-#include <glib-2.0/glib.h>
+#include <glib.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/libsigrokdecode4DSL/libsigrokdecode.h b/libsigrokdecode4DSL/libsigrokdecode.h
index be6f9bd8..90117735 100755
--- a/libsigrokdecode4DSL/libsigrokdecode.h
+++ b/libsigrokdecode4DSL/libsigrokdecode.h
@@ -23,7 +23,7 @@
 #define LIBSIGROKDECODE_LIBSIGROKDECODE_H
 
 #include <stdint.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 #define DECODE_NUM_HEX_MAX_LEN		35
 
diff --git a/libsigrokdecode4DSL/session.c b/libsigrokdecode4DSL/session.c
index 727b596b..32597486 100755
--- a/libsigrokdecode4DSL/session.c
+++ b/libsigrokdecode4DSL/session.c
@@ -22,7 +22,7 @@
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
 #include <inttypes.h>
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /**
  * @file
diff --git a/libsigrokdecode4DSL/srd.c b/libsigrokdecode4DSL/srd.c
index 1fe0e23e..5a43b98e 100755
--- a/libsigrokdecode4DSL/srd.c
+++ b/libsigrokdecode4DSL/srd.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include "libsigrokdecode.h"
-#include <glib-2.0/glib.h>
+#include <glib.h>
 
 /** @cond PRIVATE */