Fix compilation with tinyc

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>

diff --git a/ChangeLog b/ChangeLog
index 0e1f61d168c25c9eedef8d88aa9eba22a2444a9b..5359e09d085a4a744c4da5c0d95592cf9ccd0b7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@ Changes Prior to 1.12.0 release
        assembling stacked devices has a better chance of working.
     -   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 d8a36a4763cbb04282a9274d724583a461665e8c..c55f48af045148e7045eb18bff4679e2a49cad11 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -268,3 +268,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 45d4bcd68f6fc5ba87734f7a2220459b81be169e..3a4a0853f49b0707b5aefa8879b46f42f5ff3f64 100644 (file)
--- a/util.c
+++ b/util.c
@@ -669,3 +669,9 @@ void put_md_name(char *name)
        if (strncmp(name, "/dev/.tmp.md", 12)==0)
                unlink(name);
 }
+
+#ifdef __TINYC__
+/* tinyc doesn't optimize this check in ioctl.h out ... */
+unsigned int __invalid_size_argument_for_IOC = 0;
+#endif
+