--- CBOR-XS/XS.xs	2013/10/26 21:06:37	1.4
+++ CBOR-XS/XS.xs	2013/10/26 21:14:20	1.5
@@ -19,17 +19,6 @@
 #define SB do {
 #define SE } while (0)
 
-#if __GNUC__ >= 3
-# define expect(expr,value)         __builtin_expect ((expr), (value))
-# define INLINE                     static inline
-#else
-# define expect(expr,value)         (expr)
-# define INLINE                     static
-#endif
-
-#define expect_false(expr) expect ((expr) != 0, 0)
-#define expect_true(expr)  expect ((expr) != 0, 1)
-
 #define IN_RANGE_INC(type,val,beg,end) \
   ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \
   <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg)))
@@ -56,7 +45,7 @@
   HV *cb_sk_object;
 } CBOR;
 
-INLINE void
+ecb_inline void
 cbor_init (CBOR *cbor)
 {
   Zero (cbor, 1, CBOR);
@@ -66,7 +55,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // utility functions
 
-INLINE SV *
+ecb_inline SV *
 get_bool (const char *name)
 {
   SV *sv = get_sv (name, 1);
@@ -77,7 +66,7 @@
   return sv;
 }
 
-INLINE void
+ecb_inline void
 shrink (SV *sv)
 {
   sv_utf8_downgrade (sv, 1);
@@ -110,10 +99,10 @@
   U32 depth;  // recursion level
 } enc_t;
 
-INLINE void
+ecb_inline void
 need (enc_t *enc, STRLEN len)
 {
-  if (expect_false (enc->cur + len >= enc->end))
+  if (ecb_expect_false (enc->cur + len >= enc->end))
     {
       STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
       SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
@@ -122,7 +111,7 @@
     }
 }
 
-INLINE void
+ecb_inline void
 encode_ch (enc_t *enc, char ch)
 {
   need (enc, 1);
@@ -226,7 +215,7 @@
       else
         encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
 
-      encode_sv (enc, expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
+      encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
     }
 
   if (mg)
@@ -244,7 +233,7 @@
   SvGETMAGIC (sv);
   svt = SvTYPE (sv);
 
-  if (expect_false (SvOBJECT (sv)))
+  if (ecb_expect_false (SvOBJECT (sv)))
     {
       HV *stash = !CBOR_SLOW || cbor_boolean_stash
                   ? cbor_boolean_stash
@@ -330,10 +319,10 @@
 
   need (enc, 9);
 
-  if (expect_false (nv == (U32)nv))
+  if (ecb_expect_false (nv == (U32)nv))
     encode_uint (enc, 0x00, (U32)nv);
   //TODO: maybe I32?
-  else if (expect_false (nv == (float)nv))
+  else if (ecb_expect_false (nv == (float)nv))
     {
       uint32_t fp = ecb_float_to_binary32 (nv);
 
@@ -431,7 +420,7 @@
 
 #define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
 
-#define WANT(len) if (expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data");
+#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
 
 #define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)
 #define DEC_DEC_DEPTH --dec->depth