From 0894e92a5c52ea926332f0648dffa0392357ff73 Mon Sep 17 00:00:00 2001 From: aymeric Date: Sat, 6 Sep 2008 00:29:31 +0000 Subject: [PATCH] Add missing b64 on windows platform git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@9 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/mediastreamer2/src/msrtp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/linphone/mediastreamer2/src/msrtp.c b/linphone/mediastreamer2/src/msrtp.c index 58f5353a6..c82e6c6c4 100644 --- a/linphone/mediastreamer2/src/msrtp.c +++ b/linphone/mediastreamer2/src/msrtp.c @@ -21,8 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "mediastreamer2/msticker.h" #include "ortp/telephonyevents.h" +#if defined(__cplusplus) +#define B64_NO_NAMESPACE +#endif #include "ortp/b64.h" + struct SenderData { RtpSession *session; struct CandidatePair *cpair; /* table of 10 cpair */ @@ -126,7 +130,7 @@ static int sender_unmute_mic(MSFilter * f, void *arg) static int sender_set_relay_session_id(MSFilter *f, void*arg){ SenderData *d = (SenderData *) f->data; const char *tmp=(const char *)arg; - d->relay_session_id_size=b64_decode(tmp, strlen(tmp), d->relay_session_id, sizeof(d->relay_session_id)); + d->relay_session_id_size=b64_decode(tmp, strlen(tmp), (void*)d->relay_session_id, (unsigned int)sizeof(d->relay_session_id)); return 0; } @@ -185,7 +189,7 @@ static void sender_process(MSFilter * f) if (d->relay_session_id_size>0 && ( (f->ticker->time-d->last_rsi_time)>5000 || d->last_rsi_time==0) ) { ms_message("relay session id sent in RTCP APP"); - rtp_session_send_rtcp_APP(s,0,"RSID",d->relay_session_id,d->relay_session_id_size); + rtp_session_send_rtcp_APP(s,0,"RSID",(const uint8_t *)d->relay_session_id,d->relay_session_id_size); d->last_rsi_time=f->ticker->time; }