From fa50c60d7b3b4963a9e3810c41a216577f76d7af Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 23 Sep 2010 21:52:17 -0400
Subject: mtd-utils: convert to common.h/min

Kill off duplicated min() defines and convert to the common.h one.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---
 jffs-dump.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'jffs-dump.c')

diff --git a/jffs-dump.c b/jffs-dump.c
index 31cdad2..3176469 100644
--- a/jffs-dump.c
+++ b/jffs-dump.c
@@ -14,6 +14,8 @@
 #include <linux/types.h>
 #include <asm/byteorder.h>
 
+#include "common.h"
+
 #define BLOCK_SIZE 1024
 #define JFFS_MAGIC 0x34383931 /* "1984" */
 #define JFFS_MAX_NAME_LEN 256
@@ -32,8 +34,6 @@
 #define JFFS_MAGIC_BITMASK 0x34383931
 #define JFFS_DIRTY_BITMASK 0x00000000
 
-#define min(x,y) (x) > (y) ? (y) : (x)
-
 struct jffs_raw_inode
 {
 	uint32_t magic;    /* A constant magic number.  */
-- 
cgit v1.2.3