Remove unneeded 'extern "C"'.

System headers, glib headers, and libsigrok/libsigrokdecode headers all
use 'extern "C"' already, so there's no need to explicitly add these
in PulseView (for these cases).

Thanks R. Diez <redacted> for the patch!

diff --git a/main.cpp b/main.cpp
index e98506fcc0ea19d2d0dc2572252d3ab85748eca4..fae6d5f20927149d4996aa0a161f07db8628580e 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -18,12 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 

-extern "C" {

 #include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include <signal.h>
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
 #include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #include <signal.h>
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>

-}

 
 #include <getopt.h>
 
 
 #include <getopt.h>
 

diff --git a/pv/dialogs/about.cpp b/pv/dialogs/about.cpp
index 9195b83bb56d67cf56022fb4c207ae2a00e54de8..53072e78c6d7e562a3c239f20571b8e37252c6d3 100644 (file)
--- a/pv/dialogs/about.cpp
+++ b/pv/dialogs/about.cpp
@@ -18,21 +18,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 

-extern "C" {

 #include <sigrokdecode.h>
 #include <sigrokdecode.h>

-}

 
 #include <QTextDocument>
 
 #include "about.h"
 #include <ui_about.h>
 
 
 #include <QTextDocument>
 
 #include "about.h"
 #include <ui_about.h>
 

-extern "C" {

 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
 #include <glib.h>
 #include <libsigrok/libsigrok.h>

-}
+

 
 namespace pv {
 namespace dialogs {
 
 namespace pv {
 namespace dialogs {

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 35b0da57b3c9d87c14396d50bff73c495976162f..6b0fa676303052cb9478f2e1f4eaff7abd3a1bbf 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 

-extern "C" {

 #include <sigrokdecode.h>
 #include <sigrokdecode.h>

-}

 
 #include <QAction>
 #include <QApplication>
 
 #include <QAction>
 #include <QApplication>


@@ -37,7 +35,6 @@ extern "C" {
 #include "dialogs/about.h"
 #include "view/view.h"
 
 #include "dialogs/about.h"
 #include "view/view.h"
 

-extern "C" {

 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>


@@ -45,7 +42,7 @@ extern "C" {
 #include <stdarg.h>
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
 #include <stdarg.h>
 #include <glib.h>
 #include <libsigrok/libsigrok.h>

-}
+

 
 namespace pv {
 
 
 namespace pv {