Changes in kernel/generic/include/macros.h [a211838:83dab11] in mainline

File:

• kernel/generic/include/macros.h (modified) (5 diffs)

kernel/generic/include/macros.h

@@ -62 +62 @@
         if (sz2)
                 return ((s1 >= s2) && (s1 <= e2));
-        
         if (sz1)
                 return ((s2 >= s1) && (s2 <= e1));
@@ -87 +86 @@
         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;
 
@@ -100 +97 @@
 #endif /* __ASM__ */
 
-#define ispwr2(x)  (((x) & ((x) - 1)) == 0)
+#define ispwr2(x)       (((x) & ((x) - 1)) == 0)
 
 #define isdigit(d)     (((d) >= '0') && ((d) <= '9'))
@@ -145 +142 @@
 
 /* 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))
 
@@ -160 +157 @@
         })
 
+
+#ifndef member_to_inst
 #define member_to_inst(ptr_member, type, member_identif) \
-        ((type *) (((void *) (ptr_member)) - \
-            ((void *) &(((type *) 0)->member_identif))))
+        ((type*) (((void*)(ptr_member)) - ((void*)&(((type*)0)->member_identif))))
+#endif
+
 
 #endif