From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 1/2] dump: don't redefine min() or max()
Date: Tue, 15 Jul 2014 15:45:05 +1000 [thread overview]
Message-ID: <1405403106-3084-2-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1405403106-3084-1-git-send-email-david@fromorbit.com>
From: Dave Chinner <dchinner@redhat.com>
They are included from other header files.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
common/util.h | 3 ---
restore/dirattr.c | 2 --
restore/namreg.c | 2 --
restore/node.c | 3 ---
4 files changed, 10 deletions(-)
diff --git a/common/util.h b/common/util.h
index 529c319..86ea8d2 100644
--- a/common/util.h
+++ b/common/util.h
@@ -67,9 +67,6 @@ extern intgen_t read_buf( char *bufp,
intgen_t *statp );
-#define min( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
-#define max( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
-
/* strncpyterm - like strncpy, but guarantees the destination is null-terminated
*/
diff --git a/restore/dirattr.c b/restore/dirattr.c
index 8a1fb06..fcfa0c8 100644
--- a/restore/dirattr.c
+++ b/restore/dirattr.c
@@ -51,8 +51,6 @@
/* structure definitions used locally ****************************************/
-#define max( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
-
/* node handle limits
*/
#ifdef DIRATTRCHK
diff --git a/restore/namreg.c b/restore/namreg.c
index 80d558a..41362d1 100644
--- a/restore/namreg.c
+++ b/restore/namreg.c
@@ -34,8 +34,6 @@
/* structure definitions used locally ****************************************/
-#define max( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
-
#define NAMREG_AVGLEN 10
/* persistent context for a namreg - placed in first page
diff --git a/restore/node.c b/restore/node.c
index b5df88a..4cc8fb0 100644
--- a/restore/node.c
+++ b/restore/node.c
@@ -30,9 +30,6 @@
#include "node.h"
#include "mmap.h"
-#define max( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
-#define min( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
-
extern size_t pgsz;
extern size_t pgmask;
--
2.0.0
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2014-07-15 5:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-15 5:45 [PATCH 0/2] xfsdump: fix build issues Dave Chinner
2014-07-15 5:45 ` Dave Chinner [this message]
2014-07-15 10:20 ` [PATCH 1/2] dump: don't redefine min() or max() Christoph Hellwig
2014-07-15 5:45 ` [PATCH 2/2] dump: fix translation build errors Dave Chinner
2014-07-15 10:21 ` Christoph Hellwig
2014-07-15 14:55 ` Jakub Bogusz
2014-07-15 15:40 ` Christoph Hellwig
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=1405403106-3084-2-git-send-email-david@fromorbit.com \
--to=david@fromorbit.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