summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2005-06-14 00:56:58 +0000
committerNeil Brown <neilb@suse.de>2005-06-14 00:56:58 +0000
commit30d6e98519f213124afac266b2a29efc540e5068 (patch)
tree8ba5f09a8a809ba69346653376a72c9789a8eb75
parent389c403df31b1f63360478e85553bca29439d363 (diff)
downloadmdadm-30d6e98519f213124afac266b2a29efc540e5068.tar.gz
mdadm-30d6e98519f213124afac266b2a29efc540e5068.tar.xz
mdadm-30d6e98519f213124afac266b2a29efc540e5068.zip
Fix compilation with tinyc
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
-rw-r--r--ChangeLog1
-rw-r--r--mdadm.h11
-rw-r--r--util.c6
3 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e1f61d..5359e09 100644
--- 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 d8a36a4..c55f48a 100644
--- 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 45d4bcd..3a4a085 100644
--- 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
+