Commit 81f40f5b authored by Danmei Chen's avatar Danmei Chen

Merge branch 'master' of git.linphone.org:belle-sip

parents c195cbf9 d8c5e9e0
......@@ -25,19 +25,11 @@
#include <errno.h>
#include "belle-sip/defs.h"
#ifdef BCTBX_LOG_DOMAIN
#undef BCTBX_LOG_DOMAIN
#endif
#ifndef BELLE_SIP_LOG_DOMAIN
#define BELLE_SIP_LOG_DOMAIN "belle-sip"
#endif
#define BCTBX_LOG_DOMAIN BELLE_SIP_LOG_DOMAIN
#include "bctoolbox/logging.h"
#include "bctoolbox/vconnect.h"
#define BELLE_SIP_LOG_DOMAIN "belle-sip"
BELLE_SIP_BEGIN_DECLS
#define belle_sip_malloc bctbx_malloc
......
......@@ -153,6 +153,10 @@ set(BELLE_SIP_SOURCE_FILES_C
${TUNNEL_SOURCE_FILES_C}
)
add_definitions(
-DBCTBX_LOG_DOMAIN="belle-sip"
)
if(ANDROID)
list(APPEND BELLE_SIP_SOURCE_FILES_C wakelock.c)
endif()
......
......@@ -317,5 +317,5 @@ GET_SET_STRING(belle_sip_stack,http_proxy_host)
GET_SET_INT(belle_sip_stack,http_proxy_port, int)
void belle_sip_set_log_handler(belle_sip_log_function_t func) {
bctbx_set_log_handler_for_domain(func, BELLE_SIP_LOG_DOMAIN);
bctbx_set_log_handler_for_domain(func, BCTBX_LOG_DOMAIN);
}
......@@ -46,6 +46,10 @@ set(SOURCE_FILES_C
register_tester.h
)
add_definitions(
-DBCTBX_LOG_DOMAIN="belle-sip"
)
set(SOURCE_FILES_OBJC )
if (IOS)
list(APPEND SOURCE_FILES_OBJC belle_sip_tester_ios.m)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment