Merge branch 'develop' into MXS-129

2015-06-12 13:53:41 +03:00
parent 1c68a9a872 d3cc9be52e
commit 5936916e04
11 changed files with 133 additions and 26 deletions
--- a/server/include/gwdirs.h.in
+++ b/server/include/gwdirs.h.in
@ -18,9 +18,11 @@
 *
 * Copyright MariaDB Corporation Ab 2015
 */
-
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE 1
+#endif
 #include <stdlib.h>
-
+#include <string.h>
 /** Default file locations, configured by CMake */
 static const char* default_cnf_fname = "maxscale.cnf";
 static const char* default_configdir = "/etc/";