Compile mysql_binlog and mysql_utils as C++

2017-03-24 11:14:07 +02:00
parent 8d7653bdff
commit 1e3e09f81c
3 changed files with 3 additions and 2 deletions
--- a/server/core/CMakeLists.txt
+++ b/server/core/CMakeLists.txt
@ -38,7 +38,8 @@ add_library(maxscale-common SHARED
  thread.cc
  users.cc
  utils.cc
-  mysql_utils.c mysql_binlog.c modulecmd.c)
+  mysql_utils.cc
+  mysql_binlog.cc modulecmd.c)

 if(WITH_JEMALLOC)
  target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES})
--- a/server/core/mysql_binlog.cc
+++ b/server/core/mysql_binlog.cc
--- a/server/core/mysql_utils.cc
+++ b/server/core/mysql_utils.cc
@ -117,7 +117,7 @@ uint64_t mxs_leint_consume(uint8_t ** c)
 char* mxs_lestr_consume_dup(uint8_t** c)
 {
    uint64_t slen = mxs_leint_consume(c);
-    char *str = MXS_MALLOC((slen + 1) * sizeof(char));
+    char *str = (char*)MXS_MALLOC((slen + 1) * sizeof(char));

    if (str)
    {