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...

diff --git a/daemons/cmirrord/functions.h b/daemons/cmirrord/functions.h
index 524fd0ba2104e86f817e0ce903a3285af1b4ffcb..d78ab0c66acd6bb4319847c957870f6aed77bb71 100644 (file)
--- 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 832722a703f68e6ba73d72ae0829feee313b4a2d..ae7c85d000f9700e6ef6a980148b37592ec81bf6 100644 (file)
--- 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 <sys/types.h>
 #include <sys/stat.h>

diff --git a/libdm/misc/dmlib.h b/libdm/misc/dmlib.h
index 0b937cdda88aee120b8406f58f930b11577cd338..a0eff727f179bf4f72185cd2f551da038e583b26 100644 (file)
--- 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 <unistd.h>