diff --git a/include/maxscale/cdefs.h b/include/maxscale/cdefs.h index 3ca29133d..21263b5dc 100644 --- a/include/maxscale/cdefs.h +++ b/include/maxscale/cdefs.h @@ -39,6 +39,14 @@ #undef OPENSSL_THREAD_DEFINES #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. * diff --git a/server/core/config.cc b/server/core/config.cc index 1e1789f5b..0048f6535 100644 --- a/server/core/config.cc +++ b/server/core/config.cc @@ -623,7 +623,8 @@ config_load_and_process(const char* filename, bool (*process_config)(CONFIG_CONT if (duplicate_context_init(&dcontext)) { - CONFIG_CONTEXT ccontext = {.object = (char*)""}; + CONFIG_CONTEXT ccontext = {}; + ccontext.object = (char*)""; if (config_load_single_file(filename, &dcontext, &ccontext)) { diff --git a/server/core/config_runtime.cc b/server/core/config_runtime.cc index 610647d54..22bd913d3 100644 --- a/server/core/config_runtime.cc +++ b/server/core/config_runtime.cc @@ -348,7 +348,8 @@ static void add_monitor_defaults(MXS_MONITOR *monitor) { /** Inject the default module parameters in case we only deleted * a parameter */ - CONFIG_CONTEXT ctx = {.object = (char*)""}; + CONFIG_CONTEXT ctx = {}; + ctx.object = (char*)""; const MXS_MODULE *mod = get_module(monitor->module_name, MODULE_MONITOR); if (mod) @@ -427,7 +428,9 @@ bool runtime_alter_monitor(MXS_MONITOR *monitor, char *key, char *value) if (value[0]) { - MXS_CONFIG_PARAMETER p = {.name = key, .value = value}; + MXS_CONFIG_PARAMETER p = {}; + p.name = key; + p.value = value; monitorAddParameters(monitor, &p); } diff --git a/server/core/dcb.cc b/server/core/dcb.cc index 715018e24..a731922db 100644 --- a/server/core/dcb.cc +++ b/server/core/dcb.cc @@ -2461,7 +2461,9 @@ bool count_by_usage_cb(DCB *dcb, void *data) int 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); diff --git a/server/core/filter.cc b/server/core/filter.cc index d67af9e4c..853b26168 100644 --- a/server/core/filter.cc +++ b/server/core/filter.cc @@ -329,7 +329,8 @@ filter_add_option(MXS_FILTER_DEF *filter, const char *option) void 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); ctx.parameters->next = filter->parameters;