build: include configure.h

It's important to consistenly include  configure.h as the 1st. header.
It containts #defines influencing behavior of other included header
files.

diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c
index 3ad81ce73c1c4ed7083e29ccbf43e7abd2a72361..dcc743deba67f266411fdca0babf4cc253e25574 100644 (file)
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -16,6 +16,7 @@
  * dmeventd - dm event daemon to monitor active mapped devices
  */
 
+#include "device_mapper/misc/dmlib.h"
 #include "base/memory/zalloc.h"
 #include "device_mapper/misc/dm-logging.h"
 

diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c
index 157b5f1528a9d9cfa59926b28d40c14d80e60d93..e58a0ce8c800a6ce08f4da81630963d733162d80 100644 (file)
--- a/daemons/dmeventd/libdevmapper-event.c
+++ b/daemons/dmeventd/libdevmapper-event.c
@@ -12,9 +12,9 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "device_mapper/misc/dmlib.h"
 #include "base/memory/zalloc.h"
 #include "device_mapper/misc/dm-logging.h"
-#include "device_mapper/misc/dmlib.h"
 #include "daemons/dmeventd/libdevmapper-event.h"
 #include "dmeventd.h"
 #include "lib/misc/intl.h"

diff --git a/device_mapper/all.h b/device_mapper/all.h
index 8dcb38ca64b20d90f6a3e166b9c305ad159be1ca..602b7ba10e8d3c3fe4b45d850b2a4ebafbb927ca 100644 (file)
--- a/device_mapper/all.h
+++ b/device_mapper/all.h
@@ -17,6 +17,9 @@
 #ifndef LIB_DEVICE_MAPPER_H
 #define LIB_DEVICE_MAPPER_H
 
+#include "base/data-struct/list.h"
+#include "base/data-struct/hash.h"
+
 #include <inttypes.h>
 #include <stdarg.h>
 #include <sys/types.h>
@@ -31,9 +34,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "base/data-struct/list.h"
-#include "base/data-struct/hash.h"
-
 #ifndef __GNUC__
 # define __typeof__ typeof
 #endif

diff --git a/device_mapper/libdm-common.c b/device_mapper/libdm-common.c
index d46d4b05ca677c7191861ba7740d054266690722..111fff68046d40dc05ffdb608f4a96d827caf332 100644 (file)
--- a/device_mapper/libdm-common.c
+++ b/device_mapper/libdm-common.c
@@ -13,12 +13,12 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "base/memory/zalloc.h"
-#include "device_mapper/misc/dmlib.h"
-#include "ioctl/libdm-targets.h"
+#include "misc/dmlib.h"
 #include "libdm-common.h"
+#include "ioctl/libdm-targets.h"
 #include "misc/kdev_t.h"
 #include "misc/dm-ioctl.h"
+#include "base/memory/zalloc.h"
 
 #include <stdarg.h>
 #include <sys/param.h>

diff --git a/device_mapper/vdo/status.c b/device_mapper/vdo/status.c
index 7a26e1a8947f9706267665b230e29008e5a86900..f423ca15e966b5f61daf60ca6cea88aecbfb0cca 100644 (file)
--- a/device_mapper/vdo/status.c
+++ b/device_mapper/vdo/status.c
@@ -1,3 +1,4 @@
+#include "configure.h"
 #include "target.h"
 
 // For DM_ARRAY_SIZE!

diff --git a/lib/device/bcache.h b/lib/device/bcache.h
index cb36c30886bfebae4139161050f607f9479d14ab..ae5e69c8b7a4bf6d31880dfc39d3220cd23caf33 100644 (file)
--- a/lib/device/bcache.h
+++ b/lib/device/bcache.h
@@ -15,6 +15,7 @@
 #ifndef BCACHE_H
 #define BCACHE_H
 
+#include "configure.h"
 #include "device_mapper/all.h"
 
 #include <linux/fs.h>

diff --git a/libdm/dm-tools/dmsetup.c b/libdm/dm-tools/dmsetup.c
index 83786f44de8ca53d6e96e3eb9fa2ceab17997e6c..44386a6dd764c9cf626798c95817fbf3aef4b0f2 100644 (file)
--- a/libdm/dm-tools/dmsetup.c
+++ b/libdm/dm-tools/dmsetup.c
@@ -18,11 +18,10 @@
 
 // For canonicalize_file_name()
 #define _GNU_SOURCE
-#include <stdlib.h>
 
+#include "configure.h"
 #include "libdm/misc/dm-logging.h"
 #include "libdm/dm-tools/util.h"
-#include "configure.h"
 
 #include <ctype.h>
 #include <dirent.h>
@@ -35,6 +34,7 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 #ifdef UDEV_SYNC_SUPPORT
 #  include <sys/types.h>

diff --git a/test/unit/activation-generator_t.c b/test/unit/activation-generator_t.c
index 9f6b661ca4dc9a82de3f2f85de8ab84edadb4d2a..cff096888211057faaf6a0019e7c18c5e67ff829 100644 (file)
--- a/test/unit/activation-generator_t.c
+++ b/test/unit/activation-generator_t.c
@@ -12,9 +12,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "scripts/generator-internals.c"
-#include "framework.h"
 #include "units.h"
+#include "scripts/generator-internals.c"
 
 #include "device_mapper/all.h"
 

diff --git a/test/unit/bcache_t.c b/test/unit/bcache_t.c
index 5e0700572411e47a859d510165907cf177138609..92c2d57d4d2a04376a514384e467d8e7b962e475 100644 (file)
--- a/test/unit/bcache_t.c
+++ b/test/unit/bcache_t.c
@@ -12,15 +12,14 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "units.h"
+#include "lib/device/bcache.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "lib/device/bcache.h"
-#include "framework.h"
-#include "units.h"
-
 #define SHOW_MOCK_CALLS 0
 
 /*----------------------------------------------------------------

diff --git a/test/unit/bcache_utils_t.c b/test/unit/bcache_utils_t.c
index 66780ea213c6c5aec82ba7708fb10c759213c1a7..2e083209614132a24a5d84786a765dd5a29326b1 100644 (file)
--- a/test/unit/bcache_utils_t.c
+++ b/test/unit/bcache_utils_t.c
@@ -14,9 +14,8 @@
 
 #define _GNU_SOURCE
 
-#include "lib/device/bcache.h"
-#include "framework.h"
 #include "units.h"
+#include "lib/device/bcache.h"
 
 #include <errno.h>
 #include <stdio.h>

diff --git a/test/unit/framework.h b/test/unit/framework.h
index 0c455969c6791542a14da9e639d332faa6f130f7..d5a2cddda99c3023065bc87376c59055bb4f7619 100644 (file)
--- a/test/unit/framework.h
+++ b/test/unit/framework.h
@@ -1,6 +1,7 @@
 #ifndef TEST_UNIT_FRAMEWORK_H
 #define TEST_UNIT_FRAMEWORK_H
 
+#include "configure.h"
 #include "device_mapper/all.h"
 
 #include <stdbool.h>

diff --git a/test/unit/io_engine_t.c b/test/unit/io_engine_t.c
index 1a4f638e511ff06307c9d09eac1c31e1bd855d04..bac9c38622196fbb1b9a5ce69f056f8ea38b6d69 100644 (file)
--- a/test/unit/io_engine_t.c
+++ b/test/unit/io_engine_t.c
@@ -14,6 +14,9 @@
 
 #define _GNU_SOURCE
 
+#include "units.h"
+#include "lib/device/bcache.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,10 +25,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "lib/device/bcache.h"
-#include "framework.h"
-#include "units.h"
-
 //----------------------------------------------------------------
 
 #define SECTOR_SIZE 512

diff --git a/test/unit/radix_tree_t.c b/test/unit/radix_tree_t.c
index 2fba15f055c107d5a8937932b35c087f8a656f5e..e5d3e982a8ee7e8d1a573904a72f493a961a2283 100644 (file)
--- a/test/unit/radix_tree_t.c
+++ b/test/unit/radix_tree_t.c
@@ -10,11 +10,10 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  
+#include "units.h"
 #include "base/data-struct/radix-tree.h"
 #include "base/memory/container_of.h"
 
-#include "units.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/test/unit/vdo_t.c b/test/unit/vdo_t.c
index 9c41887eee8181ff8fe815032a23ef50fcc28859..a26c0b90e1ee5f3ff111b5f3ea74676f625bf607 100644 (file)
--- a/test/unit/vdo_t.c
+++ b/test/unit/vdo_t.c
@@ -12,9 +12,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "device_mapper/vdo/target.h"
-#include "framework.h"
 #include "units.h"
+#include "device_mapper/vdo/target.h"
 
 //----------------------------------------------------------------