diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-03-23 15:49:34 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-03-23 15:53:03 +0100 |
| commit | 8ab14577a8b62975ae75e4a6c5ebc1c291699db2 (patch) | |
| tree | d20e844f9d5cbeac34a5ceb9d6e4db30dfd8f32a /kopete/protocols/jabber/jingle/libjingle/talk/session | |
| parent | 5829099f44f684ff3775664e6482e148a4f9815a (diff) | |
| download | tdenetwork-8ab14577a8b62975ae75e4a6c5ebc1c291699db2.tar.gz tdenetwork-8ab14577a8b62975ae75e4a6c5ebc1c291699db2.zip | |
kopete - jabber/jingle: Do not enforce mediastreamer includes to be as plain Cr14.0.10
because it can lead to FTBFS. Use extern "C" {...} inside the appropriate includes.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit db2db9c25c875bf9d2acf762aeb57f0ac8eb7b9e)
Diffstat (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/session')
| -rw-r--r-- | kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cpp | 2 | ||||
| -rw-r--r-- | kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h | 2 |
2 files changed, 0 insertions, 4 deletions
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 <ortp.h> #include <netdb.h> #include <unistd.h> 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 { |