From 0215ad32a16e73c9132366a138d91c9946270f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 4 Jan 2017 05:53:34 +0200 Subject: [PATCH] Fix double declaration of _XOPEN_SOURCE The adminusers.c file declared it twice; first explicitly and then implicitly by including cdefs.h. --- include/maxscale/cdefs.h | 2 +- server/core/adminusers.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/maxscale/cdefs.h b/include/maxscale/cdefs.h index 4f163ee1e..96e0220f5 100644 --- a/include/maxscale/cdefs.h +++ b/include/maxscale/cdefs.h @@ -20,7 +20,7 @@ * - Its purpose is the same as that of x86_64-linux-gnu/sys/cdefs.h, that is, * it defines things that are dependent upon the compilation environment. * - Since this *must* be included as the very first header by all other MaxScale - * headers, it allows you to redfine things globally, should that be necessary, + * headers, it allows you to redefine things globally, should that be necessary, * for instance, when debugging something. * - Global constants applicable across the line can be defined here. */ diff --git a/server/core/adminusers.c b/server/core/adminusers.c index f0d1a1946..14ac55ce3 100644 --- a/server/core/adminusers.c +++ b/server/core/adminusers.c @@ -10,13 +10,11 @@ * of this software will be governed by version 2 or later of the General * Public License. */ +#include #include #include #include #include -#ifndef _XOPEN_SOURCE -#define _XOPEN_SOURCE 700 -#endif #include #include #include