Fix compile errors in Centos 6
Fix compile errors in Centos 6
This commit is contained in:
@ -39,6 +39,14 @@
|
|||||||
#undef OPENSSL_THREAD_DEFINES
|
#undef OPENSSL_THREAD_DEFINES
|
||||||
#define OPENSSL_THREAD_DEFINES 1
|
#define OPENSSL_THREAD_DEFINES 1
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fix compile errors for PRId64
|
||||||
|
* in Centos 6
|
||||||
|
*/
|
||||||
|
#ifndef __STDC_FORMAT_MACROS
|
||||||
|
# define __STDC_FORMAT_MACROS
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Define intended for use with strerror.
|
* Define intended for use with strerror.
|
||||||
*
|
*
|
||||||
|
@ -623,7 +623,8 @@ config_load_and_process(const char* filename, bool (*process_config)(CONFIG_CONT
|
|||||||
|
|
||||||
if (duplicate_context_init(&dcontext))
|
if (duplicate_context_init(&dcontext))
|
||||||
{
|
{
|
||||||
CONFIG_CONTEXT ccontext = {.object = (char*)""};
|
CONFIG_CONTEXT ccontext = {};
|
||||||
|
ccontext.object = (char*)"";
|
||||||
|
|
||||||
if (config_load_single_file(filename, &dcontext, &ccontext))
|
if (config_load_single_file(filename, &dcontext, &ccontext))
|
||||||
{
|
{
|
||||||
|
@ -348,7 +348,8 @@ 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 = (char*)""};
|
CONFIG_CONTEXT ctx = {};
|
||||||
|
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)
|
||||||
@ -427,7 +428,9 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, char *key, char *value)
|
|||||||
|
|
||||||
if (value[0])
|
if (value[0])
|
||||||
{
|
{
|
||||||
MXS_CONFIG_PARAMETER p = {.name = key, .value = value};
|
MXS_CONFIG_PARAMETER p = {};
|
||||||
|
p.name = key;
|
||||||
|
p.value = value;
|
||||||
monitorAddParameters(monitor, &p);
|
monitorAddParameters(monitor, &p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2461,7 +2461,9 @@ bool count_by_usage_cb(DCB *dcb, void *data)
|
|||||||
int
|
int
|
||||||
dcb_count_by_usage(DCB_USAGE usage)
|
dcb_count_by_usage(DCB_USAGE usage)
|
||||||
{
|
{
|
||||||
struct dcb_usage_count val = {.count = 0, .type = usage};
|
struct dcb_usage_count val = {};
|
||||||
|
val.count = 0;
|
||||||
|
val.type = usage;
|
||||||
|
|
||||||
dcb_foreach(count_by_usage_cb, &val);
|
dcb_foreach(count_by_usage_cb, &val);
|
||||||
|
|
||||||
|
@ -329,7 +329,8 @@ filter_add_option(MXS_FILTER_DEF *filter, const char *option)
|
|||||||
void
|
void
|
||||||
filter_add_parameter(MXS_FILTER_DEF *filter, const char *name, const char *value)
|
filter_add_parameter(MXS_FILTER_DEF *filter, const char *name, const char *value)
|
||||||
{
|
{
|
||||||
CONFIG_CONTEXT ctx = {.object = (char*)""};
|
CONFIG_CONTEXT ctx = {};
|
||||||
|
ctx.object = (char*)"";
|
||||||
|
|
||||||
config_add_param(&ctx, name, value);
|
config_add_param(&ctx, name, value);
|
||||||
ctx.parameters->next = filter->parameters;
|
ctx.parameters->next = filter->parameters;
|
||||||
|
Reference in New Issue
Block a user