From 2ef0e530b67a3064a059a2611e130005eccd7118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 4 Feb 2015 16:19:33 +0100 Subject: [PATCH] Fix compilation. Compatibility with C99 --- coreapi/linphonecall.c | 6 ++++-- tester/multicast_call_tester.c | 3 +-- tester/presence_tester.c | 9 ++++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index a7382b51b..8491c7b12 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -548,6 +548,9 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall * LinphoneAddress *addr; const char* local_audio_ip; const char* local_video_ip; + const char *subject; + CodecConstraints codec_hints={0}; + /*multicast is only set in case of outgoing call*/ if (call->dir == LinphoneCallOutgoing && linphone_core_audio_multicast_enabled(lc)) { local_audio_ip=linphone_core_get_audio_multicast_addr(lc); @@ -564,8 +567,7 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall * local_video_ip=call->localip; - const char *subject=linphone_call_params_get_session_name(call->params); - CodecConstraints codec_hints={0}; + subject=linphone_call_params_get_session_name(call->params); linphone_core_adapt_to_network(lc,call->ping_time,call->params); diff --git a/tester/multicast_call_tester.c b/tester/multicast_call_tester.c index 963fbe62f..e5a05c11e 100644 --- a/tester/multicast_call_tester.c +++ b/tester/multicast_call_tester.c @@ -91,7 +91,6 @@ static void call_multicast_video(void) { static void early_media_with_multicast_base(bool_t video) { LinphoneCoreManager *marie, *pauline, *pauline2; MSList* lcs = NULL; - LinphoneCall* marie_call; int dummy=0; int leaked_objects; int begin; @@ -137,7 +136,7 @@ static void early_media_with_multicast_base(bool_t video) { Marie calls Pauline, and after the call has rung, transitions to an early_media session */ - marie_call = linphone_core_invite_address(marie->lc, pauline->identity); + linphone_core_invite_address(marie->lc, pauline->identity); CU_ASSERT_TRUE(wait_for_list(lcs, &pauline->stat.number_of_LinphoneCallIncomingReceived,1,3000)); CU_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallOutgoingRinging,1,1000)); diff --git a/tester/presence_tester.c b/tester/presence_tester.c index 6f29658ed..871aacf4f 100644 --- a/tester/presence_tester.c +++ b/tester/presence_tester.c @@ -408,14 +408,17 @@ static void test_forked_subscribe_notify_publish(void) { LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc"); LinphoneProxyConfig* proxy; LinphonePresenceModel* presence; + LpConfig *pauline_lp; + char* lf_identity; + LinphoneFriend *lf; MSList* lcs=ms_list_append(NULL,pauline->lc); lcs=ms_list_append(lcs,marie->lc); lcs=ms_list_append(lcs,marie->lc); lcs=ms_list_append(lcs,marie2->lc); - LpConfig *pauline_lp = linphone_core_get_config(pauline->lc); - char* lf_identity=linphone_address_as_string_uri_only(marie->identity); - LinphoneFriend *lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity); + pauline_lp = linphone_core_get_config(pauline->lc); + lf_identity=linphone_address_as_string_uri_only(marie->identity); + lf = linphone_core_create_friend_with_address(pauline->lc,lf_identity); lp_config_set_int(pauline_lp,"sip","subscribe_expires",5);