Commit 1d9fd4fa authored by Monty's avatar Monty

Fixed compiler warnings in guess_malloc_library

parent d9e90292
...@@ -21,8 +21,13 @@ ...@@ -21,8 +21,13 @@
#include "my_global.h" #include "my_global.h"
#include <m_string.h> #include <m_string.h>
typedef const char* (*tc_version_type)(int*, int*, const char**);
typedef int (*mallctl_type)(const char*, void*, size_t*, void*, size_t);
char *guess_malloc_library() char *guess_malloc_library()
{ {
tc_version_type tc_version_func;
mallctl_type mallctl_func;
#ifndef HAVE_DLOPEN #ifndef HAVE_DLOPEN
return (char*) MALLOC_LIBRARY; return (char*) MALLOC_LIBRARY;
#else #else
...@@ -34,9 +39,7 @@ char *guess_malloc_library() ...@@ -34,9 +39,7 @@ char *guess_malloc_library()
} }
/* tcmalloc */ /* tcmalloc */
typedef const char* (*tc_version_type)(int*, int*, const char**); tc_version_func= (tc_version_type) dlsym(RTLD_DEFAULT, "tc_version");
tc_version_type tc_version_func =
(tc_version_type) dlsym(RTLD_DEFAULT, "tc_version");
if (tc_version_func) if (tc_version_func)
{ {
int major, minor; int major, minor;
...@@ -46,9 +49,7 @@ char *guess_malloc_library() ...@@ -46,9 +49,7 @@ char *guess_malloc_library()
} }
/* jemalloc */ /* jemalloc */
typedef int (*mallctl_type)(const char*, void*, size_t*, void*, size_t); mallctl_func= (mallctl_type) dlsym(RTLD_DEFAULT, "mallctl");
mallctl_type mallctl_func =
(mallctl_type) dlsym(RTLD_DEFAULT, "mallctl");
if (mallctl_func) if (mallctl_func)
{ {
char *ver; char *ver;
......
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