Opt: User-defined types are specified as CT_USER, not OPT_CL_USER

[libucw.git] / ucw / bitarray.h

diff --git a/ucw/bitarray.h b/ucw/bitarray.h
index e2994c64784d3708a45052484114635bb946def8..def9e1ae8691c8f8c50e9a867fd783aff7d6b03d 100644 (file)
--- a/ucw/bitarray.h
+++ b/ucw/bitarray.h
@@ -13,32 +13,35 @@
 
 #include <string.h>
 
+#ifdef CONFIG_UCW_CLEAN_ABI
+#define bit_array_count_bits ucw_bit_array_count_bits
+#define bit_array_xrealloc ucw_bit_array_xrealloc
+#endif
+
 typedef u32 *bitarray_t; // Must be initialized by bit_array_xmalloc(), bit_array_zero() or bit_array_set_all()
 
 #define BIT_ARRAY_WORDS(n) (((n)+31)/32)
 #define BIT_ARRAY_BYTES(n) (4*BIT_ARRAY_WORDS(n))
 #define BIT_ARRAY(name,size) u32 name[BIT_ARRAY_WORDS(size)]
 
-static inline bitarray_t
-bit_array_xmalloc(uns n)
+static inline bitarray_t bit_array_xmalloc(uns n)
 {
   return xmalloc(BIT_ARRAY_BYTES(n));
 }
 
-static inline bitarray_t
-bit_array_xmalloc_zero(uns n)
+bitarray_t bit_array_xrealloc(bitarray_t a, uns old_n, uns new_n);
+
+static inline bitarray_t bit_array_xmalloc_zero(uns n)
 {
   return xmalloc_zero(BIT_ARRAY_BYTES(n));
 }
 
-static inline void
-bit_array_zero(bitarray_t a, uns n)
+static inline void bit_array_zero(bitarray_t a, uns n)
 {
   bzero(a, BIT_ARRAY_BYTES(n));
 }
 
-static inline void
-bit_array_set_all(bitarray_t a, uns n)
+static inline void bit_array_set_all(bitarray_t a, uns n)
 {
   uns w = n / 32;
   memset(a, 255, w * 4);
@@ -47,20 +50,17 @@ bit_array_set_all(bitarray_t a, uns n)
     a[w] = (1U << m) - 1;
 }
 
-static inline void
-bit_array_set(bitarray_t a, uns i)
+static inline void bit_array_set(bitarray_t a, uns i)
 {
   a[i/32] |= (1 << (i%32));
 }
 
-static inline void
-bit_array_clear(bitarray_t a, uns i)
+static inline void bit_array_clear(bitarray_t a, uns i)
 {
   a[i/32] &= ~(1 << (i%32));
 }
 
-static inline void
-bit_array_assign(bitarray_t a, uns i, uns x)
+static inline void bit_array_assign(bitarray_t a, uns i, uns x)
 {
   if (x)
     bit_array_set(a, i);
@@ -68,28 +68,24 @@ bit_array_assign(bitarray_t a, uns i, uns x)
     bit_array_clear(a, i);
 }
 
-static inline uns
-bit_array_isset(bitarray_t a, uns i)
+static inline uns bit_array_isset(bitarray_t a, uns i)
 {
   return a[i/32] & (1 << (i%32));
 }
 
-static inline uns
-bit_array_get(bitarray_t a, uns i)
+static inline uns bit_array_get(bitarray_t a, uns i)
 {
   return !! bit_array_isset(a, i);
 }
 
-static inline uns
-bit_array_test_and_set(bitarray_t a, uns i)
+static inline uns bit_array_test_and_set(bitarray_t a, uns i)
 {
   uns t = bit_array_isset(a, i);
   bit_array_set(a, i);
   return t;
 }
 
-static inline uns
-bit_array_test_and_clear(bitarray_t a, uns i)
+static inline uns bit_array_test_and_clear(bitarray_t a, uns i)
 {
   uns t = bit_array_isset(a, i);
   bit_array_clear(a, i);