From 5c0ade35e2066c940d88a38d88d7508385a2dd63 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 4 Apr 2024 17:54:52 +0200 Subject: [PATCH] util: swap header file load order Ensure libdevmapper is included before util.h since we are going to add function that is using it. TODO: maybe add include directly here... --- daemons/cmirrord/functions.h | 1 + libdm/dm-tools/dmfilemapd.c | 2 +- libdm/misc/dmlib.h | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemons/cmirrord/functions.h b/daemons/cmirrord/functions.h index 524fd0ba2..d78ab0c66 100644 --- a/daemons/cmirrord/functions.h +++ b/daemons/cmirrord/functions.h @@ -13,6 +13,7 @@ #define _LVM_CLOG_FUNCTIONS_H #include "libdm/libdevmapper.h" +#include "libdm/dm-tools/util.h" #include "libdm/misc/dm-log-userspace.h" #include "cluster.h" diff --git a/libdm/dm-tools/dmfilemapd.c b/libdm/dm-tools/dmfilemapd.c index 832722a70..ae7c85d00 100644 --- a/libdm/dm-tools/dmfilemapd.c +++ b/libdm/dm-tools/dmfilemapd.c @@ -14,8 +14,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "util.h" #include "libdm/misc/dm-logging.h" +#include "util.h" #include #include diff --git a/libdm/misc/dmlib.h b/libdm/misc/dmlib.h index 0b937cdda..a0eff727f 100644 --- a/libdm/misc/dmlib.h +++ b/libdm/misc/dmlib.h @@ -92,9 +92,8 @@ #define DM_EXPORT_SYMBOL_BASE(func) #endif -#include "libdm/dm-tools/util.h" - #include "libdm/libdevmapper.h" +#include "libdm/dm-tools/util.h" #include "libdm/misc/dm-logging.h" #include