From 1c72219a882c896b4e798a69d7a763e22e43da1a Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Mon, 10 Jan 2022 20:45:58 +0100
Subject: [PATCH] Fix ordering of macros in settings.c

---
 src/common/settings.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/settings.c b/src/common/settings.c
index e3219c57d..9d571bd2e 100644
--- a/src/common/settings.c
+++ b/src/common/settings.c
@@ -2,9 +2,6 @@
 
 #include <pthread.h>
 
-#ifdef FF_HAVE_GIO
-#include <gio/gio.h>
-
 #define FF_LIBRARY_DATA_LOAD_INIT(dataObject, userLibraryName, ...) \
     static dataObject data; \
     static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; \
@@ -44,6 +41,9 @@
         return NULL; \
     }
 
+#ifdef FF_HAVE_GIO
+#include <gio/gio.h>
+
 typedef struct GVariantGetters
 {
     FF_LIBRARY_SYMBOL(g_variant_get_string)
@@ -231,7 +231,7 @@ static const XFConfData* getXFConfData(FFinstance* instance)
     FF_LIBRARY_DATA_LOAD_SYMBOL(xfconf_channel_get_int)
     FF_LIBRARY_DATA_LOAD_SYMBOL(xfconf_init)
 
-    if(data.ffxfconf_init(NULL) == FALSE)
+    if(data.ffxfconf_init(NULL) == false)
         FF_LIBRARY_DATA_LOAD_ERROR
 
     FF_LIBRARY_DATA_LOAD_RETURN