diff --git a/lib/datastruct/lvm-types.h b/lib/datastruct/lvm-types.h index e96009d59..de144bd94 100644 --- a/lib/datastruct/lvm-types.h +++ b/lib/datastruct/lvm-types.h @@ -21,11 +21,6 @@ #include "libdevmapper.h" -/* Define some portable printing types */ -#define PRIsize_t "zu" -#define PRIptrdiff_t "td" -#define PRIpid_t PRId32 - struct str_list { struct dm_list list; const char *str; diff --git a/lib/misc/lib.h b/lib/misc/lib.h index 100827ddb..f0dba251e 100644 --- a/lib/misc/lib.h +++ b/lib/misc/lib.h @@ -25,17 +25,22 @@ #define _GNU_SOURCE #define _FILE_OFFSET_BITS 64 +/* Define some portable printing types */ +#define PRIsize_t "zu" +#define PRIptrdiff_t "td" +#define PRIpid_t PRId32 + #include "intl.h" #include "libdevmapper.h" -#include "lvm-globals.h" -#include "lvm-wrappers.h" -#include "lvm-types.h" #include "util.h" #ifdef DM # include "dm-logging.h" #else # include "lvm-logging.h" +# include "lvm-globals.h" +# include "lvm-wrappers.h" +# include "lvm-types.h" #endif #include