Fix build on older systems

Avoid conflict with MINOR/MAJOR.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/Makefile b/Makefile
index 9effdaa4d5b3e8560059e39f3e6310e1f5bedc8a..61cdb66f445235b45f30d73594874fb90d4ba308 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ depend:
 cscope:
        @cscope -b
 
 cscope:
        @cscope -b
 

-$(PROGS): | depend
+$(PROGS): depend

 
 install: $(PROGS) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
 
 install: $(PROGS) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)

diff --git a/blktrace.c b/blktrace.c
index 629aebed84d7b40ebcb58942f1383a6a8b0bdfae..8ebbae6f2fbe788c3c2ee353385535dac68c90ce 100644 (file)
--- a/blktrace.c
+++ b/blktrace.c
@@ -142,16 +142,16 @@ static int lookup_device(char *path, unsigned int maj, unsigned int min)
        return found;
 }
 
        return found;
 }
 

-#define MINORBITS      20
-#define MINORMASK      ((1U << MINORBITS) - 1)
-#define MAJOR(dev)     ((unsigned int) ((dev) >> MINORBITS))
-#define MINOR(dev)     ((unsigned int) ((dev) & MINORMASK))
+#define FMINORBITS     20
+#define FMINORMASK     ((1U << FMINORBITS) - 1)
+#define FMAJOR(dev)    ((unsigned int) ((dev) >> FMINORBITS))
+#define FMINOR(dev)    ((unsigned int) ((dev) & FMINORMASK))

 
 static void trace_add_file(struct thread_data *td, __u32 device)
 {
        static unsigned int last_maj, last_min;
 
 static void trace_add_file(struct thread_data *td, __u32 device)
 {
        static unsigned int last_maj, last_min;

-       unsigned int maj = MAJOR(device);
-       unsigned int min = MINOR(device);
+       unsigned int maj = FMAJOR(device);
+       unsigned int min = FMINOR(device);

        struct fio_file *f;
        char dev[256];
        unsigned int i;
        struct fio_file *f;
        char dev[256];
        unsigned int i;