Define CRYPT_LUKS in crypt-util.h

Also do not include libcryptsetup.h directly, but only through crypt-util.h.
This way we do not have to repeat the define in every file where it is used.

diff --git a/src/basic/crypt-util.h b/src/basic/crypt-util.h
index e8e753275a3c870ba1673abb177d1de03e9dbe4e..537f785607979a89ed39efb34d854a1fbe085623 100644 (file)
--- a/src/basic/crypt-util.h
+++ b/src/basic/crypt-util.h
@@ -23,6 +23,11 @@
 
 #include "macro.h"
 
+/* libcryptsetup define for any LUKS version, compatible with libcryptsetup 1.x */
+#ifndef CRYPT_LUKS
+#define CRYPT_LUKS NULL
+#endif
+
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct crypt_device *, crypt_free);
 
 void cryptsetup_log_glue(int level, const char *msg, void *usrptr);

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 84bcdb467da99e7f79ef344ab6b85992d2ae0ab0..ab4d24ca3bc5bc50782c5a98b59f79bf5299e82c 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -19,7 +19,6 @@
 ***/
 
 #include <errno.h>
-#include <libcryptsetup.h>
 #include <mntent.h>
 #include <string.h>
 #include <sys/mman.h>
@@ -40,11 +39,6 @@
 #include "strv.h"
 #include "util.h"
 
-/* libcryptsetup define for any LUKS version, compatible with libcryptsetup 1.x */
-#ifndef CRYPT_LUKS
-#define CRYPT_LUKS NULL
-#endif
-
 /* internal helper */
 #define ANY_LUKS "LUKS"
 

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 2714b3921cb7dd3ede37372473afebcefd781717..6f294ed0bf2e898fccc6b5b6fc369c4d41d6a461 100644 (file)
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -18,13 +18,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#if HAVE_LIBCRYPTSETUP
-#include <libcryptsetup.h>
-#ifndef CRYPT_LUKS
-#define CRYPT_LUKS NULL
-#endif
-#endif
-
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/wait.h>