Merge pull request DreamSourceLab#392 from nickelpro/master

DreamSourceLab · web-flow · commit 7d1bdfe88918 · 2021-04-15T10:07:22.000+08:00
Remove unnecessary extern "C"s, fix build failures.
diff --git 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
@@ -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
@@ -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"
