Signed-off-by: Jaegeuk Kim <[email protected]>
---
mkfs/f2fs_format.c | 3 ++-
tools/f2fscrypt.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
index ce7d1c9e40bd..2759b5a03bc4 100644
--- a/mkfs/f2fs_format.c
+++ b/mkfs/f2fs_format.c
@@ -24,7 +24,8 @@
#include "config.h"
#ifdef HAVE_UUID_UUID_H
#include <uuid/uuid.h>
-#else
+#endif
+#ifndef HAVE_LIBUUID
#define uuid_parse(a, b) -1
#define uuid_generate(a)
#endif
diff --git a/tools/f2fscrypt.c b/tools/f2fscrypt.c
index f2fbf0bf3878..4c5d87036225 100644
--- a/tools/f2fscrypt.c
+++ b/tools/f2fscrypt.c
@@ -356,7 +356,7 @@ static void parse_salt(char *salt_str, int flags)
perror("F2FS_IOC_GET_ENCRYPTION_PWSALT");
exit(1);
}
-#ifdef HAVE_UUID_UUID_H
+#ifdef HAVE_LIBUUID
if (options & OPT_VERBOSE) {
char tmp[80];
uuid_unparse(buf, tmp);
@@ -384,7 +384,7 @@ static void parse_salt(char *salt_str, int flags)
(((unsigned char)(h - hexchars) << 4) +
(unsigned char)(l - hexchars));
}
-#ifdef HAVE_UUID_UUID_H
+#ifdef HAVE_LIBUUID
} else if (uuid_parse(cp, buf) == 0) {
salt_len = 16;
#endif
--
2.36.0.rc2.479.g8af0fa9b8e-goog
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
