Index: kernel/generic/include/macros.h
===================================================================
--- kernel/generic/include/macros.h	(revision 4ed41b3e13c688b74f72670e2c04efe22ad7a9a8)
+++ kernel/generic/include/macros.h	(revision f5e5f73a339f61a91c3b3d97e7798f71f126023a)
@@ -62,4 +62,5 @@
 	if (sz2)
 		return ((s1 >= s2) && (s1 <= e2));
+	
 	if (sz1)
 		return ((s2 >= s1) && (s2 <= e1));
@@ -86,7 +87,9 @@
 	if (sz1 == 0)
 		return (s1 == s2) && (sz2 == 0);
-	e1 = s1 + sz1 - 1;	
+	
+	e1 = s1 + sz1 - 1;
 	if (sz2 == 0)
 		return (s1 <= s2) && (s2 <= e1);
+	
 	e2 = s2 + sz2 - 1;
 
@@ -97,5 +100,5 @@
 #endif /* __ASM__ */
 
-#define ispwr2(x)	(((x) & ((x) - 1)) == 0)
+#define ispwr2(x)  (((x) & ((x) - 1)) == 0)
 
 #define isdigit(d)     (((d) >= '0') && ((d) <= '9'))
@@ -142,5 +145,5 @@
 
 /* Test for sum overflow into positive numbers. */
-#define overflows_into_positive(a, b)	\
+#define overflows_into_positive(a, b) \
 	(overflows((a), (b)) && ((a) + (b) > 0))
 
@@ -157,10 +160,7 @@
 	})
 
-
-#ifndef member_to_inst
 #define member_to_inst(ptr_member, type, member_identif) \
-	((type*) (((void*)(ptr_member)) - ((void*)&(((type*)0)->member_identif))))
-#endif
-
+	((type *) (((void *) (ptr_member)) - \
+	    ((void *) &(((type *) 0)->member_identif))))
 
 #endif