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)

5 files changed, 21 insertions, 5 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 {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mediastream.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mediastream.h
index 4cf9f425..1b00f069 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mediastream.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mediastream.h
@@ -36,6 +36,9 @@
 #endif
 #include "msringplayer.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
 struct _AudioStream
 {
@@ -127,4 +130,8 @@ void video_preview_stop(VideoStream *stream);
 
 #endif
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.h
index fad596ae..902664ab 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/ms.h
@@ -25,6 +25,9 @@
 #include "msfilter.h"
 #include "mssync.h"
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
 void ms_init();
 
@@ -76,6 +79,8 @@ gchar * ms_proc_get_param(gchar *parameter);
 gint ms_proc_get_type();
 gint ms_proc_get_speed();
 
-
+#if defined(__cplusplus)
+}
+#endif
 
 #endif
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h
index 370af69e..6ad1aba9 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.h
@@ -25,6 +25,10 @@
 #include <mscodec.h>
 #include <speex.h>
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 struct _MSSpeexDec
 {
 	MSFilter parent;
@@ -66,4 +70,8 @@ void ms_speex_dec_uninit_core(MSSpeexDec *obj);
 void ms_speex_dec_process(MSSpeexDec *obj);
 void ms_speex_dec_destroy(MSSpeexDec *obj);
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif