Skip to content

Commit 33cc733

Browse files
committed
Remove unnecessary extern "C"s, fix build failures.
Wrapping libsigrockdecode.h in extern "C" is unecessary and will cause build failures on modern versions of glib, this fixes those failures.
1 parent f6308ab commit 33cc733

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

DSView/pv/data/decode/annotation.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2020
*/
2121

22-
extern "C" {
2322
#include <libsigrokdecode4DSL/libsigrokdecode.h>
24-
}
2523

2624
#include <vector>
2725
#include <assert.h>

DSView/pv/view/decodetrace.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2020
*/
2121

22-
extern "C" {
2322
#include <libsigrokdecode4DSL/libsigrokdecode.h>
24-
}
2523

2624
#include <extdef.h>
2725

DSView/pv/widgets/decodergroupbox.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
* along with this program; if not, write to the Free Software
1919
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2020
*/
21-
extern "C" {
2221
#include <libsigrokdecode4DSL/libsigrokdecode.h>
23-
}
2422

2523
#include "decodergroupbox.h"
2624
#include "../data/decoderstack.h"

0 commit comments

Comments
 (0)