[systemd-devel] [PATCH] fix #ifdef
Ronny Chevalier
chevalier.ronny at gmail.com
Tue Jul 8 00:22:25 PDT 2014
---
Zbigniew seems to have fix the LZ4 decompression, so here
is the remaining part of the previous patch
src/journal/journal-def.h | 2 +-
src/journal/journal-file.c | 2 +-
src/journal/test-compress.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
index ecfa9a2..089dd98 100644
--- a/src/journal/journal-def.h
+++ b/src/journal/journal-def.h
@@ -180,7 +180,7 @@ enum {
};
#define HEADER_COMPATIBLE_ANY HEADER_COMPATIBLE_SEALED
-#if HAVE_GCRYPT
+#ifdef HAVE_GCRYPT
# define HEADER_COMPATIBLE_SUPPORTED HEADER_COMPATIBLE_SEALED
#else
# define HEADER_COMPATIBLE_SUPPORTED 0
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index b6de502..d3535d2 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2476,7 +2476,7 @@ int journal_file_open(
f->flags = flags;
f->prot = prot_from_flags(flags);
f->writable = (flags & O_ACCMODE) != O_RDONLY;
-#if defined(HAVE_LZ)
+#if defined(HAVE_LZ4)
f->compress_lz4 = compress;
#elif defined(HAVE_XZ)
f->compress_xz = compress;
diff --git a/src/journal/test-compress.c b/src/journal/test-compress.c
index 6ac8373..4c0a9a0 100644
--- a/src/journal/test-compress.c
+++ b/src/journal/test-compress.c
@@ -27,7 +27,7 @@
# define XZ_OK -EPROTONOSUPPORT
#endif
-#ifdef HAVE_XZ
+#ifdef HAVE_LZ4
# define LZ4_OK 0
#else
# define LZ4_OK -EPROTONOSUPPORT
--
2.0.1
More information about the systemd-devel
mailing list