Index: branches/azimutz/Chazi/i386/libsaio/ext2fs.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/ext2fs.c	(revision 622)
+++ branches/azimutz/Chazi/i386/libsaio/ext2fs.c	(revision 623)
@@ -37,6 +37,6 @@
 		return;
 	}
 	str[strMaxLen]=0;
-	strncpy (str, buf+0x478, min (strMaxLen, 16));
+	strncpy (str, buf+0x478, MIN(strMaxLen, 16));
 	free (buf);
 }
Index: branches/azimutz/Chazi/i386/libsaio/saio_types.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/saio_types.h	(revision 622)
+++ branches/azimutz/Chazi/i386/libsaio/saio_types.h	(revision 623)
@@ -231,14 +231,23 @@
     DEV_EN = 3
 };
 
-//Azi: change this stuff back to upercase??
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
+/*
+ * Macros for min/max.
+ *
+ * Azi: defined on <sys/param.h>; includes, check later...
+ */
+#ifndef MIN
+#define	MIN(a,b) ( ((a) < (b)) ? (a) : (b) )
+#endif
+#ifndef MAX
+#define	MAX(a,b) ( ((a) > (b)) ? (a) : (b) )
+#endif
 
-#define	round2(x, m)	(((x) + (m / 2)) & ~(m - 1))
+//Azi: not in use
+/*#define	round2(x, m)	(((x) + (m / 2)) & ~(m - 1))
 #define roundup2(x, m)  (((x) + m - 1) & ~(m - 1))
 
-#define MAKEKERNDEV(t, u, p)  MAKEBOOTDEV(t, 0, 0, u, p)
+#define MAKEKERNDEV(t, u, p)  MAKEBOOTDEV(t, 0, 0, u, p)*/
 
 enum {
     kNetworkDeviceType = kBIOSDevTypeNetwork,