From fe6729fa8cde33bce8d693e3f082fae688b1ff09 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Tue, 14 Jun 2005 06:43:00 +0000 Subject: [PATCH] Fix compilation with tinyc Signed-off-by: Neil Brown --- ChangeLog | 1 + mdadm.h | 11 +++++++++++ util.c | 7 ++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0daf2181..9fa9faa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ Changes Prior to this release - Allow --force with --grow so '-Gfn1' works (on raid1) - Replace sprintf calls with snprintf (to quiet diet-libc) - Add man page for mdassemble + - Fix compilation with tinyc Changes Prior to 1.11.0 release - Fix embarassing bug which causes --add to always fail. diff --git a/mdadm.h b/mdadm.h index bb124776..1451c33c 100644 --- a/mdadm.h +++ b/mdadm.h @@ -321,3 +321,14 @@ extern int open_mddev(char *dev, int autof); #define ModeMask 0x1f #define ModeShift 5 + + +#ifdef __TINYC__ +#undef minor +#undef major +#undef makedev +#define minor(x) ((x)&0xff) +#define major(x) (((x)>>8)&0xff) +#define makedev(M,m) (((M)<<8) | (m)) +#endif + diff --git a/util.c b/util.c index fab01929..8756d499 100644 --- a/util.c +++ b/util.c @@ -548,7 +548,6 @@ void put_md_name(char *name) - struct superswitch *superlist[] = { &super0, &super1, NULL }; struct supertype *super_by_version(int vers, int minor) @@ -610,3 +609,9 @@ struct supertype *guess_super(int fd) free(st); return NULL; } + +#ifdef __TINYC__ +/* tinyc doesn't optimize this check in ioctl.h out ... */ +unsigned int __invalid_size_argument_for_IOC = 0; +#endif + -- 2.39.2