hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile config_runtime.c as C++

Browse Source
This commit is contained in:
Johan Wikman
2017-03-22 22:15:38 +02:00
parent 74085978b4
commit 71ae3cf524
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/CMakeLists.txt
View File

@ -5,7 +5,8 @@ add_library(maxscale-common SHARED
authenticator.cc authenticator.cc
buffer.cc buffer.cc
config.cc config.cc
config_runtime.c dcb.c filter.c filter.cc externcmd.c paths.c hashtable.c hint.c housekeeper.c load_utils.c log_manager.cc maxscale_pcre2.c misc.c mlist.c modutil.c monitor.c queuemanager.c query_classifier.cc poll.c random_jkiss.c resultset.c router.cc secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c) config_runtime.cc
dcb.c filter.c filter.cc externcmd.c paths.c hashtable.c hint.c housekeeper.c load_utils.c log_manager.cc maxscale_pcre2.c misc.c mlist.c modutil.c monitor.c queuemanager.c query_classifier.cc poll.c random_jkiss.c resultset.c router.cc secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c skygw_utils.cc statistics.c listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c)
if(WITH_JEMALLOC) if(WITH_JEMALLOC)
target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES}) target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES})

2
server/core/config_runtime.c → server/core/config_runtime.cc
View File

@ -348,7 +348,7 @@ static void add_monitor_defaults(MXS_MONITOR *monitor)
{ {
/** Inject the default module parameters in case we only deleted /** Inject the default module parameters in case we only deleted
* a parameter */ * a parameter */
CONFIG_CONTEXT ctx = {.object = ""}; CONFIG_CONTEXT ctx = {.object = (char*)""};
const MXS_MODULE *mod = get_module(monitor->module_name, MODULE_MONITOR); const MXS_MODULE *mod = get_module(monitor->module_name, MODULE_MONITOR);
if (mod) if (mod)