From db2db9c25c875bf9d2acf762aeb57f0ac8eb7b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 23 Mar 2021 15:49:34 +0100 Subject: kopete - jabber/jingle: Do not enforce mediastreamer includes to be as plain C because it can lead to FTBFS. Use extern "C" {...} inside the appropriate includes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cpp | 2 -- .../jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h | 2 -- 2 files changed, 4 deletions(-) (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/session/phone') diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cpp b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cpp index 756456d3..ad8fddf9 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cpp +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cpp @@ -18,7 +18,6 @@ */ // LinphoneMediaEngine is a Linphone implementation of MediaEngine -extern "C" { #include "talk/third_party/mediastreamer/mediastream.h" #ifdef HAVE_ILBC #include "talk/third_party/mediastreamer/msilbcdec.h" @@ -26,7 +25,6 @@ extern "C" { #ifdef HAVE_SPEEX #include "talk/third_party/mediastreamer/msspeexdec.h" #endif -} #include #include #include diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h index 0c00be75..b8e01697 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h @@ -22,9 +22,7 @@ #ifndef TALK_SESSION_PHONE_LINPHONEMEDIAENGINE_H_ #define TALK_SESSION_PHONE_LINPHONEMEDIAENGINE_H_ -extern "C" { #include "talk/third_party/mediastreamer/mediastream.h" -} #include "talk/session/phone/mediaengine.h" namespace cricket { -- cgit v1.2.1