diff --git a/configure.ac b/configure.ac index 21a3d9ff4..8cb6c0155 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 7e38b9598..62821f28f 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -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); diff --git a/oRTP b/oRTP index 68c07b231..3c10c6783 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 68c07b23191f97619d209445e99a30418c4bfc77 +Subproject commit 3c10c678342f7c2ca2d49537b86aa81b098e6110