--- libecb/ecb.h	2011/05/26 19:40:09	1.23
+++ libecb/ecb.h	2011/06/01 01:29:36	1.33
@@ -1,7 +1,7 @@
 /*
  * libecb - http://software.schmorp.de/pkg/libecb
  *
- * Copyright (©) 2009-2011 Marc Alexander Lehmann
+ * Copyright (©) 2009-2011 Marc Alexander Lehmann <libecb@schmorp.de>
  * Copyright (©) 2011 Emanuele Giaquinta
  * All rights reserved.
  *
@@ -55,6 +55,9 @@
 #  define ECB_INLINE inline /* yeah! */
 typedef int ecb_bool;
 # endif
+#else
+# define ECB_INLINE inline
+typedef bool ecb_bool;
 #endif
 
 #define ECB_CONCAT_(a, b) a ## b
@@ -83,27 +86,30 @@
 # define ecb_decltype(x) typeof(x)
 #endif
 
-#define ecb_noinline ecb_attribute ((noinline))
-#define ecb_noreturn ecb_attribute ((noreturn))
-#define ecb_unused   ecb_attribute ((unused))
-#define ecb_const    ecb_attribute ((const))
-#define ecb_pure     ecb_attribute ((pure))
-#define ecb_hot      ecb_attribute ((hot))	/* 4.3 */
-#define ecb_cold     ecb_attribute ((cold))	/* 4.3 */
+#define ecb_artificial ecb_attribute ((__artificial__)) /* 4.3 */
+#define ecb_noinline   ecb_attribute ((__noinline__))
+#define ecb_noreturn   ecb_attribute ((__noreturn__))
+#define ecb_unused     ecb_attribute ((__unused__))
+#define ecb_const      ecb_attribute ((__const__))
+#define ecb_pure       ecb_attribute ((__pure__))
+#define ecb_hot        ecb_attribute ((__hot__))	/* 4.3 */
+#define ecb_cold       ecb_attribute ((__cold__))	/* 4.3 */
 
 /* put into if's if you are very sure that the expression */
-/* is mostly true or mosty false. note that these return */
+/* is mostly true or mostly 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)
+#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
+#define ecb_expect_true(expr)  ecb_expect (!!(expr), 1)
+#define ecb_likely(expr)   ecb_expect_true  (expr)
+#define ecb_unlikely(expr) ecb_expect_false (expr)
 
 /* try to tell the compiler that some condition is definitely true */
 #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)
+#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
@@ -180,7 +186,11 @@
 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_GCC_VERSION(3,0)
+# define ecb_mod(m,n) ((m) % (n) + ((m) % (n) < 0 ? (n) : 0))
+#else
+# define ecb_mod(m,n) ((m) < 0 ? ((n) - 1 - ((-1 - (m)) % (n))) : ((m) % (n)))
+#endif
 
 #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)