From ac7e0fac532dded716279e15fda451ff1b706290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 6 Jun 2021 15:18:23 +0200 Subject: [PATCH] Fix definitions of slot constants for old cryptsetup API. This resolves issue #137. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- CMakeLists.txt | 2 +- tdecore/tdehw/tdestoragedevice.cpp | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4fa43de8..9b1325726 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -798,7 +798,7 @@ if( WITH_CRYPTSETUP ) check_c_source_compiles(" #include #include - int main(int argc, char *argv[]) { crypt_keyslot_info status = CRYPT_SLOT_INVALID; return 0; } " + int main(int argc, char *argv[]) { crypt_keyslot_info status = CRYPT_SLOT_ACTIVE; return 0; } " HAVE_NEW_CRYPTSETUP ) check_c_source_compiles(" #include diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp index 60ea51912..e3f81fce7 100644 --- a/tdecore/tdehw/tdestoragedevice.cpp +++ b/tdecore/tdehw/tdestoragedevice.cpp @@ -43,11 +43,9 @@ #if defined(WITH_CRYPTSETUP) #ifdef CRYPTSETUP_OLD_API #define class cryptsetup_class - #define CRYPT_SLOT_INVALID INVALID - #define CRYPT_SLOT_INACTIVE INACTIVE - #define CRYPT_SLOT_ACTIVE ACTIVE - #define CRYPT_SLOT_BUSY BUSY - #define CRYPT_SLOT_ACTIVE_LAST ACTIVE + #define CRYPT_SLOT_INACTIVE SLOT_INACTIVE + #define CRYPT_SLOT_ACTIVE SLOT_ACTIVE + #define CRYPT_SLOT_ACTIVE_LAST SLOT_ACTIVE_LAST #include #undef class #else