1From ed643f0b4ac587204a5243451cda181ee1405d62 Mon Sep 17 00:00:00 2001
2From: =?utf8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
3Date: Wed, 28 Apr 2021 02:14:47 +0200
4Subject: [PATCH] Fix broken build due to C++ template behind C linkage
5
6glib/gatomic.h since 2.68 includes type_traits, which causes a compilation
7error:
8In file included from /usr/include/glib-2.0/glib/gatomic.h:31,
9                 from /usr/include/glib-2.0/glib/gthread.h:32,
10                 from /usr/include/glib-2.0/glib/gasyncqueue.h:32,
11                 from /usr/include/glib-2.0/glib.h:32,
12                 from /usr/include/libsigrokdecode/libsigrokdecode.h:25,
13                 from /home/abuild/rpmbuild/BUILD/pulseview-0.4.2/pv/data/decode/annotation.cpp:21:
14/usr/include/c++/10/type_traits:2308:3: error: template with C linkage
152308 |   template<typename _CTp, typename _Rp>
16
17As libsigrokdecode.h declares extern C linkage itself where necessary,
18remove it from pulseviews include statements from the last two occasions.
19
20[Retrieved from:
21https://sigrok.org/gitweb/?p=pulseview.git;a=commit;h=ed643f0b4ac587204a5243451cda181ee1405d62]
22Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
23---
24 pv/data/decode/annotation.cpp  | 2 --
25 pv/views/trace/decodetrace.cpp | 2 --
26 2 files changed, 4 deletions(-)
27
28diff --git a/pv/data/decode/annotation.cpp b/pv/data/decode/annotation.cpp
29index 7f233478..f8a5c47b 100644
30--- a/pv/data/decode/annotation.cpp
31+++ b/pv/data/decode/annotation.cpp
32@@ -17,9 +17,7 @@
33  * along with this program; if not, see <http://www.gnu.org/licenses/>.
34  */
35
36-extern "C" {
37 #include <libsigrokdecode/libsigrokdecode.h>
38-}
39
40 #include <cassert>
41 #include <vector>
42diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
43index 409f1d28..888064d0 100644
44--- a/pv/views/trace/decodetrace.cpp
45+++ b/pv/views/trace/decodetrace.cpp
46@@ -17,9 +17,7 @@
47  * along with this program; if not, see <http://www.gnu.org/licenses/>.
48  */
49
50-extern "C" {
51 #include <libsigrokdecode/libsigrokdecode.h>
52-}
53
54 #include <limits>
55 #include <mutex>
56--
572.24.0.rc2
58
59