--- libecb/ecb.h	2011/05/26 18:26:59	1.14
+++ libecb/ecb.h	2011/05/26 19:40:09	1.23
@@ -1,5 +1,5 @@
 /*
- * libecb
+ * libecb - http://software.schmorp.de/pkg/libecb
  *
  * Copyright (©) 2009-2011 Marc Alexander Lehmann
  * Copyright (©) 2011 Emanuele Giaquinta
@@ -34,7 +34,8 @@
 
 /* many compilers define _GNUC_ to some versions but then only implement
  * what their idiot authors think are the "more important" extensions,
- * causing enourmous grief for some better fake benchmark numbers or so.
+ * causing enourmous grief in return for some better fake benchmark numbers.
+ * or so.
  * we try to detect these and simply assume they are not gcc - if they have
  * an issue with that they should have done it right in the first place.
  */
@@ -65,12 +66,12 @@
 
 #if ECB_GCC_VERSION(3,1)
 # define ecb_attribute(attrlist)        __attribute__(attrlist)
-# define ecb_is_constant(c)             __builtin_constant_p (c)
+# define ecb_is_constant(expr)          __builtin_constant_p (expr)
 # define ecb_expect(expr,value)         __builtin_expect ((expr),(value))
 # define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
 #else
 # define ecb_attribute(attrlist)
-# define ecb_is_constant(c)             0
+# define ecb_is_constant(expr)          0
 # define ecb_expect(expr,value)         (expr)
 # define ecb_prefetch(addr,rw,locality)
 #endif
@@ -90,22 +91,21 @@
 #define ecb_hot      ecb_attribute ((hot))	/* 4.3 */
 #define ecb_cold     ecb_attribute ((cold))	/* 4.3 */
 
-/* put into ifs if you are very sure that the expression */
+/* put into if's if you are very sure that the expression */
 /* is mostly true or mosty false. note that these return */
 /* booleans, not the expression. */
 #define ecb_unlikely(expr) ecb_expect (!!(expr), 0)
 #define ecb_likely(expr)   ecb_expect (!!(expr), 1)
 
 /* try to tell the compiler that some condition is definitely true */
-#define ecb_assume(cond) do { if (!(cond)) unreachable (); } while (0)
+#define ecb_assume(cond) do { if (!(cond)) ecb_unreachable (); } while (0)
 
 /* count trailing zero bits and count # of one bits */
-ECB_HEADER_INLINE int ecb_ctz32      (uint32_t x) ecb_const;
-ECB_HEADER_INLINE int ecb_popcount32 (uint32_t x) ecb_const;
 #if ECB_GCC_VERSION(3,4)
-ECB_HEADER_INLINE int ecb_ctz32      (uint32_t x) { return __builtin_ctz      (x); }
-ECB_HEADER_INLINE int ecb_popcount32 (uint32_t x) { return __builtin_popcount (x); }
+#define ecb_ctz32      (x) __builtin_ctz      (x)
+#define ecb_popcount32 (x) __builtin_popcount (x)
 #else
+ECB_HEADER_INLINE int ecb_ctz32 (uint32_t x) ecb_const;
 ECB_HEADER_INLINE
 ecb_ctz32 (uint32_t x)
 {
@@ -122,6 +122,7 @@
   return r;
 }
 
+ECB_HEADER_INLINE int ecb_popcount32 (uint32_t x) ecb_const;
 ECB_HEADER_INLINE
 ecb_popcount32 (uint32_t x)
 {
@@ -134,10 +135,11 @@
 }
 #endif
 
-ECB_HEADER_INLINE uint32_t ecb_bswap32 (uint32_t x) ecb_const;
 #if ECB_GCC_VERSION(4,3)
-ECB_HEADER_INLINE uint32_t ecb_bswap32 (uint32_t x) { return __builtin_bswap32 (x); }
+# define ecb_bswap32(x) __builtin_bswap32 (x)
+# define ecb_bswap16(x) (__builtin_bswap32(x) >> 16)
 #else
+ECB_HEADER_INLINE uint32_t ecb_bswap32 (uint32_t x) ecb_const;
 ECB_HEADER_INLINE uint32_t
 ecb_bswap32 (uint32_t x)
 {
@@ -146,29 +148,39 @@
       | ((x <<  8) & 0x00ff0000)
       |  (x << 24);
 }
+
+ECB_HEADER_INLINE uint32_t ecb_bswap16 (uint32_t x) ecb_const;
+ECB_HEADER_INLINE uint32_t
+ecb_bswap16 (uint32_t x)
+{
+  return ((x >>  8) & 0xff)
+      |  ((x <<  8) & 0x00ff0000)
+      |  (x << 24);
+}
 #endif
 
-ECB_HEADER_INLINE void ecb_unreachable (void) ecb_attribute ((noreturn));
 #if ECB_GCC_VERSION(4,5)
-ECB_HEADER_INLINE void ecb_unreachable (void) { __builtin_unreachable (); }
+# define ecb_unreachable() __builtin_unreachable ()
 #else
 /* this seems to work fine, but gcc always emits a warning for it :/ */
+ECB_HEADER_INLINE void ecb_unreachable (void) ecb_noreturn;
 ECB_HEADER_INLINE void ecb_unreachable (void) { }
 #endif
 
-ECB_HEADER_INLINE unsigned char ecb_byteorder_helper () ecb_const;
-
+ECB_HEADER_INLINE unsigned char ecb_byteorder_helper (void) ecb_const;
 ECB_HEADER_INLINE unsigned char
-ecb_byteorder_helper ()
+ecb_byteorder_helper (void)
 {
   const uint32_t u = 0x11223344;
   return *(unsigned char *)&u;
 }
 
-ECB_HEADER_INLINE ecb_bool ecb_big_endian    () ecb_const;
-ECB_HEADER_INLINE ecb_bool ecb_big_endian    () { return ecb_byteorder_helper () == 0x11; };
-ECB_HEADER_INLINE ecb_bool ecb_little_endian () ecb_const;
-ECB_HEADER_INLINE ecb_bool ecb_little_endian () { return ecb_byteorder_helper () == 0x44; };
+ECB_HEADER_INLINE ecb_bool ecb_big_endian    (void) ecb_const;
+ECB_HEADER_INLINE ecb_bool ecb_big_endian    (void) { return ecb_byteorder_helper () == 0x11; };
+ECB_HEADER_INLINE ecb_bool ecb_little_endian (void) ecb_const;
+ECB_HEADER_INLINE ecb_bool ecb_little_endian (void) { return ecb_byteorder_helper () == 0x44; };
+
+#define ecb_mod(m, n) ((m) < 0 ? ((n) - (-(m) % (n))) : ((m) % (n)))
 
 #if ecb_cplusplus_does_not_suck
 // does not work for local types (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm)