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.
This commit is contained in:
parent
76d3e0834a
commit
c116b03595
|
@ -23,6 +23,11 @@
|
||||||
|
|
||||||
#include "macro.h"
|
#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);
|
DEFINE_TRIVIAL_CLEANUP_FUNC(struct crypt_device *, crypt_free);
|
||||||
|
|
||||||
void cryptsetup_log_glue(int level, const char *msg, void *usrptr);
|
void cryptsetup_log_glue(int level, const char *msg, void *usrptr);
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
***/
|
***/
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <libcryptsetup.h>
|
|
||||||
#include <mntent.h>
|
#include <mntent.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
@ -40,11 +39,6 @@
|
||||||
#include "strv.h"
|
#include "strv.h"
|
||||||
#include "util.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 */
|
/* internal helper */
|
||||||
#define ANY_LUKS "LUKS"
|
#define ANY_LUKS "LUKS"
|
||||||
|
|
||||||
|
|
|
@ -18,13 +18,6 @@
|
||||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
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/mount.h>
|
||||||
#include <sys/prctl.h>
|
#include <sys/prctl.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
|
|
Loading…
Reference in a new issue