From 604526667c70c8baa8c5ab77e1d9eeb655fb7fb6 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 23 Mar 2017 22:09:39 +0200 Subject: [PATCH] Compile maxscale_pcre2.c as C++ --- server/core/CMakeLists.txt | 3 ++- server/core/{maxscale_pcre2.c => maxscale_pcre2.cc} | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) rename server/core/{maxscale_pcre2.c => maxscale_pcre2.cc} (98%) diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt index 987f17b2f..393178cc5 100644 --- a/server/core/CMakeLists.txt +++ b/server/core/CMakeLists.txt @@ -14,7 +14,8 @@ add_library(maxscale-common SHARED housekeeper.cc paths.cc load_utils.cc - 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) + log_manager.cc + maxscale_pcre2.cc 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) target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES}) diff --git a/server/core/maxscale_pcre2.c b/server/core/maxscale_pcre2.cc similarity index 98% rename from server/core/maxscale_pcre2.c rename to server/core/maxscale_pcre2.cc index 6719e7810..33a9a57d6 100644 --- a/server/core/maxscale_pcre2.c +++ b/server/core/maxscale_pcre2.cc @@ -59,7 +59,7 @@ mxs_pcre2_result_t mxs_pcre2_substitute(pcre2_code *re, const char *subject, con (PCRE2_SPTR) replace, PCRE2_ZERO_TERMINATED, (PCRE2_UCHAR*) *dest, size)) == PCRE2_ERROR_NOMEMORY) { - char *tmp = MXS_REALLOC(*dest, *size * 2); + char *tmp = (char*)MXS_REALLOC(*dest, *size * 2); if (tmp == NULL) { break;