summaryrefslogtreecommitdiff
path: root/jffs-dump.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-09-23 21:52:17 -0400
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2010-09-24 15:25:03 +0300
commitfa50c60d7b3b4963a9e3810c41a216577f76d7af (patch)
tree89d72ffddb5fdec10fc931f84125bc63691d3af4 /jffs-dump.c
parentda3106bf16a7c065e2205297136c6c60b0562dc3 (diff)
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>
Diffstat (limited to 'jffs-dump.c')
-rw-r--r--jffs-dump.c4
1 files changed, 2 insertions, 2 deletions
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. */