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.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/29/head
Slávek Banko 4 years ago
parent 5fe4e2d08b
commit db2db9c25c
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -18,7 +18,6 @@
*/ */
// LinphoneMediaEngine is a Linphone implementation of MediaEngine // LinphoneMediaEngine is a Linphone implementation of MediaEngine
extern "C" {
#include "talk/third_party/mediastreamer/mediastream.h" #include "talk/third_party/mediastreamer/mediastream.h"
#ifdef HAVE_ILBC #ifdef HAVE_ILBC
#include "talk/third_party/mediastreamer/msilbcdec.h" #include "talk/third_party/mediastreamer/msilbcdec.h"
@ -26,7 +25,6 @@ extern "C" {
#ifdef HAVE_SPEEX #ifdef HAVE_SPEEX
#include "talk/third_party/mediastreamer/msspeexdec.h" #include "talk/third_party/mediastreamer/msspeexdec.h"
#endif #endif
}
#include <ortp.h> #include <ortp.h>
#include <netdb.h> #include <netdb.h>
#include <unistd.h> #include <unistd.h>

@ -22,9 +22,7 @@
#ifndef TALK_SESSION_PHONE_LINPHONEMEDIAENGINE_H_ #ifndef TALK_SESSION_PHONE_LINPHONEMEDIAENGINE_H_
#define TALK_SESSION_PHONE_LINPHONEMEDIAENGINE_H_ #define TALK_SESSION_PHONE_LINPHONEMEDIAENGINE_H_
extern "C" {
#include "talk/third_party/mediastreamer/mediastream.h" #include "talk/third_party/mediastreamer/mediastream.h"
}
#include "talk/session/phone/mediaengine.h" #include "talk/session/phone/mediaengine.h"
namespace cricket { namespace cricket {

@ -36,6 +36,9 @@
#endif #endif
#include "msringplayer.h" #include "msringplayer.h"
#if defined(__cplusplus)
extern "C" {
#endif
struct _AudioStream struct _AudioStream
{ {
@ -127,4 +130,8 @@ void video_preview_stop(VideoStream *stream);
#endif #endif
#if defined(__cplusplus)
}
#endif
#endif #endif

@ -25,6 +25,9 @@
#include "msfilter.h" #include "msfilter.h"
#include "mssync.h" #include "mssync.h"
#if defined(__cplusplus)
extern "C" {
#endif
void ms_init(); void ms_init();
@ -76,6 +79,8 @@ gchar * ms_proc_get_param(gchar *parameter);
gint ms_proc_get_type(); gint ms_proc_get_type();
gint ms_proc_get_speed(); gint ms_proc_get_speed();
#if defined(__cplusplus)
}
#endif
#endif #endif

@ -25,6 +25,10 @@
#include <mscodec.h> #include <mscodec.h>
#include <speex.h> #include <speex.h>
#if defined(__cplusplus)
extern "C" {
#endif
struct _MSSpeexDec struct _MSSpeexDec
{ {
MSFilter parent; 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_process(MSSpeexDec *obj);
void ms_speex_dec_destroy(MSSpeexDec *obj); void ms_speex_dec_destroy(MSSpeexDec *obj);
#if defined(__cplusplus)
}
#endif
#endif #endif

Loading…
Cancel
Save