From 77b3564a43416e0e2dd01c3c917b2096496cd68d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 9 Dec 2016 16:55:00 +0100 Subject: [PATCH] fix bad function declaration. Flags can't be enums. --- coreapi/linphonecore.c | 2 +- include/linphone/core.h | 2 +- mediastreamer2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 75caba253..187ef7623 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -202,7 +202,7 @@ void linphone_core_set_log_level(OrtpLogLevel loglevel) { linphone_core_set_log_level_mask(mask); } -void linphone_core_set_log_level_mask(OrtpLogLevel loglevel) { +void linphone_core_set_log_level_mask(unsigned int loglevel) { ortp_set_log_level_mask(NULL, loglevel); bctbx_set_log_level_mask(NULL, loglevel); if (loglevel == 0) { diff --git a/include/linphone/core.h b/include/linphone/core.h index 5459829a5..a9fa880bd 100644 --- a/include/linphone/core.h +++ b/include/linphone/core.h @@ -2346,7 +2346,7 @@ LINPHONE_PUBLIC void linphone_core_set_log_level(OrtpLogLevel loglevel); * * @param loglevel A bitmask of the log levels to set. */ -LINPHONE_PUBLIC void linphone_core_set_log_level_mask(OrtpLogLevel loglevel); +LINPHONE_PUBLIC void linphone_core_set_log_level_mask(unsigned int loglevel); /** * Enable logs in supplied FILE*. diff --git a/mediastreamer2 b/mediastreamer2 index 52c02e402..17a9184f5 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 52c02e402c502359b0b6c95d8afcf4435609b8ab +Subproject commit 17a9184f5d87eaf13f481215f63e338a5124b03a