From: Jan Tulak <jtulak@redhat.com>
To: xfs@oss.sgi.com
Cc: Jan Tulak <jtulak@redhat.com>
Subject: [PATCH v2 1/4] xfsprogs: Prefix LIST_... macros to XFS_LIST_...
Date: Mon, 20 Jul 2015 14:56:55 +0200 [thread overview]
Message-ID: <1437397018-12864-2-git-send-email-jtulak@redhat.com> (raw)
In-Reply-To: <1437397018-12864-1-git-send-email-jtulak@redhat.com>
OS X has some conflicting LIST_ macros, so prefix the XFS ones.
Signed-off-by: Jan Tulak <jtulak@redhat.com>
---
include/list.h | 6 +++---
repair/phase6.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/list.h b/include/list.h
index 3f087a4..7e9f748 100644
--- a/include/list.h
+++ b/include/list.h
@@ -27,10 +27,10 @@ struct list_head {
struct list_head *prev;
};
-#define LIST_HEAD_INIT(name) { &(name), &(name) }
+#define XFS_LIST_HEAD_INIT(name) { &(name), &(name) }
-#define LIST_HEAD(name) \
- struct list_head name = LIST_HEAD_INIT(name)
+#define XFS_LIST_HEAD(name) \
+ struct list_head name = XFS_LIST_HEAD_INIT(name)
#define INIT_LIST_HEAD(list) list_head_init(list)
static inline void list_head_init(struct list_head *list)
diff --git a/repair/phase6.c b/repair/phase6.c
index 9a5cba7..87732e1 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -49,7 +49,7 @@ typedef struct dotdot_update {
int ino_offset;
} dotdot_update_t;
-static LIST_HEAD(dotdot_update_list);
+static XFS_LIST_HEAD(dotdot_update_list);
static int dotdot_update;
static void
--
2.4.3
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2015-07-20 12:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-20 12:56 [PATCH v2 0/4] xfsprogs: Partial OS X support Jan Tulak
2015-07-20 12:56 ` Jan Tulak [this message]
2015-08-02 23:42 ` [PATCH v2 1/4] xfsprogs: Prefix LIST_... macros to XFS_LIST_ Dave Chinner
2015-08-03 9:34 ` Jan Tulak
2015-08-03 22:16 ` Dave Chinner
2015-08-04 8:38 ` Jan Tulak
2015-07-20 12:56 ` [PATCH v2 2/4] xfsprogs: Don't Make .po files with gettext disabled Jan Tulak
2015-07-26 16:28 ` Christoph Hellwig
2015-07-20 12:56 ` [PATCH v2 3/4] xfsprogs: Use glibtoolize on osx Jan Tulak
2015-07-26 16:29 ` Christoph Hellwig
2015-07-20 12:56 ` [PATCH v2 4/4] xfsprogs: OS X partial support Jan Tulak
2015-07-26 16:34 ` Christoph Hellwig
2015-07-27 16:45 ` Jan Tulak
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=1437397018-12864-2-git-send-email-jtulak@redhat.com \
--to=jtulak@redhat.com \
--cc=xfs@oss.sgi.com \
/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