From c69aa91fa88fe1f0372afe2a56c4e79c62fc49e0 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 22 May 2007 15:51:50 +0200 Subject: [PATCH] Fix build on older systems Avoid conflict with MINOR/MAJOR. Signed-off-by: Jens Axboe --- Makefile | 2 +- blktrace.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 9effdaa4..61cdb66f 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ depend: cscope: @cscope -b -$(PROGS): | depend +$(PROGS): depend install: $(PROGS) $(SCRIPTS) $(INSTALL) -m755 -d $(DESTDIR)$(bindir) diff --git a/blktrace.c b/blktrace.c index 629aebed..8ebbae6f 100644 --- a/blktrace.c +++ b/blktrace.c @@ -142,16 +142,16 @@ static int lookup_device(char *path, unsigned int maj, unsigned int min) 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; - 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; -- 2.25.1