From 09f4e2324e31d4577251499150ad11cf4a6bd55d Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Wed, 29 Mar 2017 10:52:56 +0200 Subject: [PATCH] Use correct macro __ios --> TARGET_OS_IPHONE --- coreapi/linphonecore.c | 4 ++-- coreapi/ringtoneplayer.c | 6 +++++- mediastreamer2 | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 1b7476749..ff8d45b20 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -1179,7 +1179,7 @@ static void sound_config_read(LinphoneCore *lc) } lc->sound_conf.latency=0; -#ifndef __ios +#if TARGET_OS_IPHONE tmp=TRUE; #else tmp=FALSE; /* on iOS we have builtin echo cancellation.*/ @@ -1687,7 +1687,7 @@ static void video_config_read(LinphoneCore *lc){ linphone_core_set_preferred_framerate(lc,lp_config_get_float(lc->config,"video","framerate",0)); -#if defined(__ANDROID__) || defined(__ios) +#if defined(__ANDROID__) || TARGET_OS_IPHONE automatic_video=0; #endif capture=lp_config_get_int(lc->config,"video","capture",1); diff --git a/coreapi/ringtoneplayer.c b/coreapi/ringtoneplayer.c index c6921c6f1..d3f7ae58b 100644 --- a/coreapi/ringtoneplayer.c +++ b/coreapi/ringtoneplayer.c @@ -21,11 +21,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "private.h" #include +#if __APPLE__ +#include "TargetConditionals.h" +#endif + int linphone_ringtoneplayer_start(MSFactory *factory, LinphoneRingtonePlayer* rp, MSSndCard* card, const char* ringtone, int loop_pause_ms) { return linphone_ringtoneplayer_start_with_cb(factory, rp, card, ringtone, loop_pause_ms, NULL, NULL); } -#ifdef __ios +#if TARGET_OS_IPHONE #include "ringtoneplayer_ios.h" diff --git a/mediastreamer2 b/mediastreamer2 index b937df188..81dd23b31 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit b937df188829f73c3f5db35ff0191aa695f27884 +Subproject commit 81dd23b3125568af5aa4a2973105a1c98a153986