mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-30 09:49:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.linphone.org:linphone

Browse source
This commit is contained in:
Jehan Monnier 2015-03-12 21:01:37 +01:00
commit 902fc4f99d
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -71,7 +71,7 @@ case $target in
mingw_found=yes
AC_CHECK_TOOL(WINDRES, windres)
;;
armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin|armv7s-apple-darwin|aarch64-apple-darwin|x86_64-apple-darwin.ios)
armv6-apple-darwin|armv7-apple-darwin|i386-apple-darwin|armv7s-apple-darwin|aarch64-apple-darwin|*-apple-darwin.ios)
CFLAGS="$CFLAGS -DTARGET_OS_IPHONE=1 "
LIBS="$LIBS -framework CoreFoundation -framework AudioToolbox -framework CoreAudio -framework Foundation -framework QuartzCore -framework OpenGLES -framework UIKit -framework AVFoundation"
ios_found=yes

5
coreapi/linphonecore.c
View file

@ -190,7 +190,10 @@ static void linphone_core_log_collection_handler(OrtpLogLevel level, const char
struct stat statbuf;
if (liblinphone_log_func != NULL) {
liblinphone_log_func(level, fmt, args);
va_list args_copy;
va_copy(args_copy, args);
liblinphone_log_func(level, fmt, args_copy);
va_end(args_copy);
}
ortp_gettimeofday(&tp, NULL);

2
oRTP

@ -1 +1 @@
Subproject commit 68c07b23191f97619d209445e99a30418c4bfc77
Subproject commit 3c10c678342f7c2ca2d49537b86aa81b098e6110