Various compile fixes.

[thirdparty/mdadm.git] / util.c

diff --git a/util.c b/util.c
index 81f936018ff4c6367a55822719ed3be0a6323a31..87c23dcfbc5eb9ca7dffb7082ddba889dbc96d3b 100644 (file)
--- a/util.c
+++ b/util.c
@@ -160,6 +160,7 @@ int get_linux_version()
        return (a*1000000)+(b*1000)+c;
 }
 
        return (a*1000000)+(b*1000)+c;
 }
 

+#ifndef MDASSEMBLE

 int mdadm_version(char *version)
 {
        int a, b, c;
 int mdadm_version(char *version)
 {
        int a, b, c;


@@ -185,7 +186,6 @@ int mdadm_version(char *version)
        return (a*1000000)+(b*1000)+c;
 }
 
        return (a*1000000)+(b*1000)+c;
 }
 

-#ifndef MDASSEMBLE

 long long parse_size(char *size)
 {
        /* parse 'size' which should be a number optionally
 long long parse_size(char *size)
 {
        /* parse 'size' which should be a number optionally