mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-10 15:45:15 -04:00
b26e5a664b
* fix extern-c error when compile * fix qt compile error * fix segfault * remove useless patches Closes: https://bugs.gentoo.org/787674 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Huang Rui <vowstar@gmail.com>
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
diff --git a/DSView/pv/data/decode/annotation.cpp b/DSView/pv/data/decode/annotation.cpp
|
|
index c433a28..7f23e36 100755
|
|
--- a/DSView/pv/data/decode/annotation.cpp
|
|
+++ b/DSView/pv/data/decode/annotation.cpp
|
|
@@ -19,9 +19,7 @@
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
-extern "C" {
|
|
#include <libsigrokdecode4DSL/libsigrokdecode.h>
|
|
-}
|
|
|
|
#include <vector>
|
|
#include <assert.h>
|
|
diff --git a/DSView/pv/view/decodetrace.cpp b/DSView/pv/view/decodetrace.cpp
|
|
index ad943ac..733497f 100755
|
|
--- a/DSView/pv/view/decodetrace.cpp
|
|
+++ b/DSView/pv/view/decodetrace.cpp
|
|
@@ -19,9 +19,7 @@
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
-extern "C" {
|
|
#include <libsigrokdecode4DSL/libsigrokdecode.h>
|
|
-}
|
|
|
|
#include <extdef.h>
|
|
|
|
diff --git a/DSView/pv/widgets/decodergroupbox.cpp b/DSView/pv/widgets/decodergroupbox.cpp
|
|
index 79d3cd8..80c4c44 100755
|
|
--- a/DSView/pv/widgets/decodergroupbox.cpp
|
|
+++ b/DSView/pv/widgets/decodergroupbox.cpp
|
|
@@ -18,9 +18,7 @@
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
-extern "C" {
|
|
#include <libsigrokdecode4DSL/libsigrokdecode.h>
|
|
-}
|
|
|
|
#include "decodergroupbox.h"
|
|
#include "../data/decoderstack.h"
|