From 957340a55154332aff8d92eae3509006054e72a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20S=C3=B6derqvist?= Date: Fri, 6 Dec 2024 22:35:47 +0100 Subject: [PATCH 1/2] Fix sanitizer builds with clang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By including after our other files, we avoid redefining a macro. Signed-off-by: Viktor Söderqvist --- src/fmacros.h | 2 +- src/unit/test_networking.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fmacros.h b/src/fmacros.h index 78efcdb71f..3c3a7abba2 100644 --- a/src/fmacros.h +++ b/src/fmacros.h @@ -34,7 +34,7 @@ #if defined(__linux__) #define _GNU_SOURCE -#define _DEFAULT_SOURCE +#define _DEFAULT_SOURCE 2 #endif #if defined(_AIX) diff --git a/src/unit/test_networking.c b/src/unit/test_networking.c index ac042d907f..566583bcc5 100644 --- a/src/unit/test_networking.c +++ b/src/unit/test_networking.c @@ -1,9 +1,9 @@ -#include - #include "../networking.c" #include "../server.c" #include "test_help.h" +#include + int test_backupAndUpdateClientArgv(int argc, char **argv, int flags) { UNUSED(argc); UNUSED(argv); From 17b07d0ac86e39810130d1a0f47e0b9aa95f641c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20S=C3=B6derqvist?= Date: Fri, 6 Dec 2024 23:02:22 +0100 Subject: [PATCH 2/2] Revert a silly change made while debugging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Viktor Söderqvist --- src/fmacros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fmacros.h b/src/fmacros.h index 3c3a7abba2..78efcdb71f 100644 --- a/src/fmacros.h +++ b/src/fmacros.h @@ -34,7 +34,7 @@ #if defined(__linux__) #define _GNU_SOURCE -#define _DEFAULT_SOURCE 2 +#define _DEFAULT_SOURCE #endif #if defined(_AIX)