diff options
| author | Dave Chinner <dchinner@redhat.com> | 2014-07-18 08:02:26 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-07-18 08:02:26 +1000 |
| commit | 5a2985233c390d59d2a9757b119cb0e001c87a96 (patch) | |
| tree | d6462b52218ee66652ff66adbb8beafcbdfe9a93 | |
| parent | 8c01c0c2193a91d218b3f64005702383db71f0f4 (diff) | |
| download | xfsdump-dev-5a2985233c390d59d2a9757b119cb0e001c87a96.tar.gz | |
dump: don't redefine min() or max()
They are included from other header files.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
| -rw-r--r-- | common/util.h | 3 | ||||
| -rw-r--r-- | restore/dirattr.c | 2 | ||||
| -rw-r--r-- | restore/namreg.c | 2 | ||||
| -rw-r--r-- | restore/node.c | 3 |
4 files changed, 0 insertions, 10 deletions
diff --git a/common/util.h b/common/util.h index 529c319b..86ea8d28 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 8a1fb063..fcfa0c8b 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 80d558a1..41362d1a 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 b5df88ac..4cc8fb05 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; |