Merge pull request #392 from nickelpro/master

Remove unnecessary extern "C"s, fix build failures.
2021-04-15 10:07:22 +08:00
parent 00f9eac233 33cc733abe
commit 7d1bdfe889
3 changed files with 0 additions and 6 deletions
--- 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>
--- 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>

--- 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"