From 5dc49a59bea5f156df9d1f053dd415cd9e968bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus456@gmail.com>
Date: Fri, 5 May 2017 19:28:44 +0300
Subject: [PATCH] Fix build failures on CentOS 6

The older C++ compiler doesn't support struct initialization with explicit
values. In addition to this, fixed a few other warnings that caused
errors.
---
 server/core/atomic.cc          | 8 ++++----
 server/core/messagequeue.cc    | 2 +-
 server/core/test/testconfig.cc | 9 ++++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/server/core/atomic.cc b/server/core/atomic.cc
index 979756555..afff9c25d 100644
--- a/server/core/atomic.cc
+++ b/server/core/atomic.cc
@@ -94,7 +94,7 @@ void atomic_store_int32(int *variable, int value)
 #ifdef MXS_USE_ATOMIC_BUILTINS
     __atomic_store_n(variable, value, __ATOMIC_SEQ_CST);
 #else
-    __sync_lock_test_and_set(variable, value);
+    (void)__sync_lock_test_and_set(variable, value);
 #endif
 }
 
@@ -103,7 +103,7 @@ void atomic_store_int64(int64_t *variable, int64_t value)
 #ifdef MXS_USE_ATOMIC_BUILTINS
     __atomic_store_n(variable, value, __ATOMIC_SEQ_CST);
 #else
-    __sync_lock_test_and_set(variable, value);
+    (void)__sync_lock_test_and_set(variable, value);
 #endif
 }
 
@@ -112,7 +112,7 @@ void atomic_store_uint64(uint64_t *variable, uint64_t value)
 #ifdef MXS_USE_ATOMIC_BUILTINS
     __atomic_store_n(variable, value, __ATOMIC_SEQ_CST);
 #else
-    __sync_lock_test_and_set(variable, value);
+    (void)__sync_lock_test_and_set(variable, value);
 #endif
 }
 
@@ -121,6 +121,6 @@ void atomic_store_ptr(void **variable, void *value)
 #ifdef MXS_USE_ATOMIC_BUILTINS
     __atomic_store_n(variable, value, __ATOMIC_SEQ_CST);
 #else
-    __sync_lock_test_and_set(variable, value);
+    (void)__sync_lock_test_and_set(variable, value);
 #endif
 }
diff --git a/server/core/messagequeue.cc b/server/core/messagequeue.cc
index c6680c72a..32ba5c46a 100644
--- a/server/core/messagequeue.cc
+++ b/server/core/messagequeue.cc
@@ -25,7 +25,7 @@
 namespace
 {
 
-struct
+static struct
 {
     bool initialized;
     int  pipe_flags;
diff --git a/server/core/test/testconfig.cc b/server/core/test/testconfig.cc
index 0448ec024..69370c4fc 100644
--- a/server/core/test/testconfig.cc
+++ b/server/core/test/testconfig.cc
@@ -43,7 +43,8 @@ int test_validity()
         {MXS_END_MODULE_PARAMS}
     };
 
-    CONFIG_CONTEXT ctx = {.object = (char*)""};
+    CONFIG_CONTEXT ctx = {};
+    ctx.object = (char*)"";
 
     /** Int parameter */
     TEST(config_param_is_valid(params, "p1", "1", &ctx));
@@ -90,7 +91,8 @@ int test_validity()
     TEST(!config_param_is_valid(params, "p6", "This is not a valid path", &ctx));
 
     /** Service parameter */
-    CONFIG_CONTEXT svc = {.object = (char*)"test-service"};
+    CONFIG_CONTEXT svc = {};
+    svc.object = (char*)"test-service";
     ctx.next = &svc;
     config_add_param(&svc, "type", "service");
     TEST(config_param_is_valid(params, "p7", "test-service", &ctx));
@@ -193,7 +195,8 @@ int test_required_parameters()
         {MXS_END_MODULE_PARAMS}
     };
 
-    CONFIG_CONTEXT ctx = {.object = (char*)""};
+    CONFIG_CONTEXT ctx = {};
+    ctx.object = (char*)"";
 
     TEST(missing_required_parameters(params, ctx.parameters));
     config_add_defaults(&ctx, params);