--- libecb/ecb.h	2011/05/26 18:36:43	1.18
+++ libecb/ecb.h	2011/05/26 19:23:53	1.21
@@ -98,14 +98,14 @@
 #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 */
 #if ECB_GCC_VERSION(3,4)
 #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 int ecb_ctz32 (uint32_t x) ecb_const;
 ECB_HEADER_INLINE
 ecb_ctz32 (uint32_t x)
 {
@@ -137,6 +137,7 @@
 
 #if ECB_GCC_VERSION(4,3)
 # 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
@@ -147,6 +148,15 @@
       | ((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
 
 #if ECB_GCC_VERSION(4,5)
@@ -170,6 +180,8 @@
 ECB_HEADER_INLINE ecb_bool ecb_little_endian () ecb_const;
 ECB_HEADER_INLINE ecb_bool ecb_little_endian () { 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)
 template<typename T, int N>