diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-06-06 15:18:23 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-06-07 12:40:59 +0200 |
| commit | ac7e0fac532dded716279e15fda451ff1b706290 (patch) | |
| tree | 75b397b6d98923f37d5fa3b6e358096d8e6810c1 | |
| parent | f23ac74e05b50cd096323aa3c809a62cf373faa0 (diff) | |
| download | tdelibs-ac7e0fac532dded716279e15fda451ff1b706290.tar.gz tdelibs-ac7e0fac532dded716279e15fda451ff1b706290.zip | |
Fix definitions of slot constants for old cryptsetup API.
This resolves issue #137.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | 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 <stddef.h> #include <libcryptsetup.h> - 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 <stddef.h> 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 <libcryptsetup.h> #undef class #else |