From: Costin Lupu <costin.lupu@cs.pub.ro>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <iwj@xenproject.org>, Wei Liu <wl@xen.org>,
Julien Grall <jgrall@amazon.com>
Subject: [PATCH v2 2/5] tools/libfsimage: Fix PATH_MAX redefinition error
Date: Fri, 30 Apr 2021 14:28:08 +0300 [thread overview]
Message-ID: <9e323285b89717cd4cd8de7fb642e447b0dcfc4e.1619781564.git.costin.lupu@cs.pub.ro> (raw)
In-Reply-To: <cover.1619781564.git.costin.lupu@cs.pub.ro>
If PATH_MAX is already defined in the system (e.g. in /usr/include/limits.h
header) then gcc will trigger a redefinition error because of -Werror.
Signed-off-by: Costin Lupu <costin.lupu@cs.pub.ro>
Reviewed-by: Julien Grall <jgrall@amazon.com>
---
tools/libfsimage/ext2fs/fsys_ext2fs.c | 2 ++
tools/libfsimage/reiserfs/fsys_reiserfs.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/tools/libfsimage/ext2fs/fsys_ext2fs.c b/tools/libfsimage/ext2fs/fsys_ext2fs.c
index a4ed10419c..5ed8fce90e 100644
--- a/tools/libfsimage/ext2fs/fsys_ext2fs.c
+++ b/tools/libfsimage/ext2fs/fsys_ext2fs.c
@@ -278,7 +278,9 @@ struct ext4_extent_header {
#define EXT2_SUPER_MAGIC 0xEF53 /* include/linux/ext2_fs.h */
#define EXT2_ROOT_INO 2 /* include/linux/ext2_fs.h */
+#ifndef PATH_MAX
#define PATH_MAX 1024 /* include/linux/limits.h */
+#endif
#define MAX_LINK_COUNT 5 /* number of symbolic links to follow */
/* made up, these are pointers into FSYS_BUF */
diff --git a/tools/libfsimage/reiserfs/fsys_reiserfs.c b/tools/libfsimage/reiserfs/fsys_reiserfs.c
index 916eb15292..10ca657476 100644
--- a/tools/libfsimage/reiserfs/fsys_reiserfs.c
+++ b/tools/libfsimage/reiserfs/fsys_reiserfs.c
@@ -284,7 +284,9 @@ struct reiserfs_de_head
#define S_ISDIR(mode) (((mode) & 0170000) == 0040000)
#define S_ISLNK(mode) (((mode) & 0170000) == 0120000)
+#ifndef PATH_MAX
#define PATH_MAX 1024 /* include/linux/limits.h */
+#endif
#define MAX_LINK_COUNT 5 /* number of symbolic links to follow */
/* The size of the node cache */
--
2.20.1
next prev parent reply other threads:[~2021-04-30 11:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 11:28 [PATCH v2 0/5] Fix redefinition errors for toolstack libs Costin Lupu
2021-04-30 11:28 ` [PATCH v2 1/5] tools/debugger: Fix PAGE_SIZE redefinition error Costin Lupu
2021-04-30 11:28 ` Costin Lupu [this message]
2021-04-30 11:28 ` [PATCH v2 3/5] tools/libs/foreignmemory: " Costin Lupu
2021-04-30 11:28 ` [PATCH v2 4/5] tools/libs/gnttab: " Costin Lupu
2021-04-30 11:28 ` [PATCH v2 5/5] tools/ocaml: Fix redefinition errors Costin Lupu
2021-04-30 11:33 ` Costin Lupu
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=9e323285b89717cd4cd8de7fb642e447b0dcfc4e.1619781564.git.costin.lupu@cs.pub.ro \
--to=costin.lupu@cs.pub.ro \
--cc=iwj@xenproject.org \
--cc=jgrall@amazon.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/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).