From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-f2fs-devel@lists.sourceforge.net
Cc: Jaegeuk Kim <jaegeuk@google.com>
Subject: [PATCH 2/2] f2fs-tools: add c++ for UNUSED
Date: Mon, 4 Mar 2019 14:17:16 -0800 [thread overview]
Message-ID: <20190304221716.36174-2-jaegeuk@kernel.org> (raw)
In-Reply-To: <20190304221716.36174-1-jaegeuk@kernel.org>
From: Jaegeuk Kim <jaegeuk@google.com>
This can avoid build failure for f2fscrypt.
Change-Id: I33eddc62eea486dc219c25d089112e011864dd4f
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
---
include/f2fs_fs.h | 2 ++
tools/f2fs_io/f2fs_io.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
index a730688..8d1490c 100644
--- a/include/f2fs_fs.h
+++ b/include/f2fs_fs.h
@@ -52,6 +52,8 @@
# define UNUSED(x) UNUSED_ ## x __attribute__((unused))
#elif defined(__LCLINT__)
# define UNUSED(x) x
+#elif defined(__cplusplus)
+# define UNUSED(x)
#else
# define UNUSED(x) x
#endif
diff --git a/tools/f2fs_io/f2fs_io.h b/tools/f2fs_io/f2fs_io.h
index 6b619bd..95fd5be 100644
--- a/tools/f2fs_io/f2fs_io.h
+++ b/tools/f2fs_io/f2fs_io.h
@@ -17,6 +17,8 @@
# define UNUSED(x) UNUSED_ ## x __attribute__((unused))
#elif defined(__LCLINT__)
# define UNUSED(x) x
+#elif defined(__cplusplus)
+# define UNUSED(x)
#else
# define UNUSED(x) x
#endif
--
2.19.0.605.g01d371f741-goog
prev parent reply other threads:[~2019-03-04 22:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-04 22:17 [PATCH 1/2] f2fscrypt: avoid to fail android build Jaegeuk Kim
2019-03-04 22:17 ` Jaegeuk Kim [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190304221716.36174-2-jaegeuk@kernel.org \
--to=jaegeuk@kernel.org \
--cc=jaegeuk@google.com \
--cc=linux-f2fs-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).