diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-11-15 11:45:00 +0000 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-11-19 17:06:57 +0000 |
| commit | b92d1eba311b968330b09316792a37256b9d0272 (patch) | |
| tree | 8b086a924930d2461c89d78818abbc22a37f83bb | |
| parent | d164ac771eae578fcb67c1d2d054ffb2beb04997 (diff) | |
| download | systemd-b92d1eba311b968330b09316792a37256b9d0272.tar.gz | |
journal: Simplify definition of HEADER_INCOMPATIBLE_SUPPORTED
| -rw-r--r-- | src/libsystemd/sd-journal/journal-def.h | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/libsystemd/sd-journal/journal-def.h b/src/libsystemd/sd-journal/journal-def.h index bd924bda8a..d64c70cbe6 100644 --- a/src/libsystemd/sd-journal/journal-def.h +++ b/src/libsystemd/sd-journal/journal-def.h @@ -161,23 +161,11 @@ enum { HEADER_INCOMPATIBLE_KEYED_HASH | \ HEADER_INCOMPATIBLE_COMPRESSED_ZSTD) -#if HAVE_XZ && HAVE_LZ4 && HAVE_ZSTD -# define HEADER_INCOMPATIBLE_SUPPORTED HEADER_INCOMPATIBLE_ANY -#elif HAVE_XZ && HAVE_LZ4 -# define HEADER_INCOMPATIBLE_SUPPORTED (HEADER_INCOMPATIBLE_COMPRESSED_XZ|HEADER_INCOMPATIBLE_COMPRESSED_LZ4|HEADER_INCOMPATIBLE_KEYED_HASH) -#elif HAVE_XZ && HAVE_ZSTD -# define HEADER_INCOMPATIBLE_SUPPORTED (HEADER_INCOMPATIBLE_COMPRESSED_XZ|HEADER_INCOMPATIBLE_COMPRESSED_ZSTD|HEADER_INCOMPATIBLE_KEYED_HASH) -#elif HAVE_LZ4 && HAVE_ZSTD -# define HEADER_INCOMPATIBLE_SUPPORTED (HEADER_INCOMPATIBLE_COMPRESSED_LZ4|HEADER_INCOMPATIBLE_COMPRESSED_ZSTD|HEADER_INCOMPATIBLE_KEYED_HASH) -#elif HAVE_XZ -# define HEADER_INCOMPATIBLE_SUPPORTED (HEADER_INCOMPATIBLE_COMPRESSED_XZ|HEADER_INCOMPATIBLE_KEYED_HASH) -#elif HAVE_LZ4 -# define HEADER_INCOMPATIBLE_SUPPORTED (HEADER_INCOMPATIBLE_COMPRESSED_LZ4|HEADER_INCOMPATIBLE_KEYED_HASH) -#elif HAVE_ZSTD -# define HEADER_INCOMPATIBLE_SUPPORTED (HEADER_INCOMPATIBLE_COMPRESSED_ZSTD|HEADER_INCOMPATIBLE_KEYED_HASH) -#else -# define HEADER_INCOMPATIBLE_SUPPORTED HEADER_INCOMPATIBLE_KEYED_HASH -#endif +#define HEADER_INCOMPATIBLE_SUPPORTED \ + ((HAVE_XZ ? HEADER_INCOMPATIBLE_COMPRESSED_XZ : 0) | \ + (HAVE_LZ4 ? HEADER_INCOMPATIBLE_COMPRESSED_LZ4 : 0) | \ + (HAVE_ZSTD ? HEADER_INCOMPATIBLE_COMPRESSED_ZSTD : 0) | \ + HEADER_INCOMPATIBLE_KEYED_HASH) enum { HEADER_COMPATIBLE_SEALED = 1 << 0, |