From a0d580ceb9d759bcff05bcb59846569dcfcf860e Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 2 Oct 2013 14:57:46 +0200 Subject: [PATCH] fix macos build issue remove useless code --- coreapi/friend.c | 12 +----------- tools/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/coreapi/friend.c b/coreapi/friend.c index 7626617ba..8493cda88 100644 --- a/coreapi/friend.c +++ b/coreapi/friend.c @@ -108,17 +108,8 @@ LinphoneFriend *linphone_find_friend_by_out_subscribe(MSList *l, SalOp *op){ } void __linphone_friend_do_subscribe(LinphoneFriend *fr){ - char *friend=NULL; - const char *from=NULL; - LinphoneProxyConfig *cfg; LinphoneCore *lc=fr->lc; - friend=linphone_address_as_string(fr->uri); - cfg=linphone_core_lookup_known_proxy(fr->lc,linphone_friend_get_address(fr)); - if (cfg!=NULL){ - from=linphone_proxy_config_get_identity(cfg); - }else from=linphone_core_get_primary_contact(fr->lc); - if (fr->outsub==NULL){ /* people for which we don't have yet an answer should appear as offline */ fr->presence=NULL; @@ -132,9 +123,8 @@ void __linphone_friend_do_subscribe(LinphoneFriend *fr){ } fr->outsub=sal_op_new(lc->sal); linphone_configure_op(lc,fr->outsub,fr->uri,NULL,TRUE); - sal_subscribe_presence(fr->outsub,from,friend,lp_config_get_int(lc->config,"sip","subscribe_expires",600)); + sal_subscribe_presence(fr->outsub,NULL,NULL,lp_config_get_int(lc->config,"sip","subscribe_expires",600)); fr->subscribe_active=TRUE; - ms_free(friend); } LinphoneFriend * linphone_friend_new(){ diff --git a/tools/Makefile.am b/tools/Makefile.am index fb6253465..d0e6d350a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -12,7 +12,8 @@ COMMON_CFLAGS=\ $(STRICT_OPTIONS) \ $(LIBXML2_CFLAGS) -AM_CXXFLAGS=$(LIBXML2_CFLAGS) $(STRICT_OPTIONS) +#-fpermissive to workaround a g++ bug on macos 32bit SDK. +AM_CXXFLAGS=$(LIBXML2_CFLAGS) $(STRICT_OPTIONS) -fpermissive EXTRA_DIST=xml2lpc_jni.cc lpc2xml_jni.cc