--- deliantra/server/server/cfperl.xs	2018/12/01 20:22:13	1.431
+++ deliantra/server/server/cfperl.xs	2018/12/05 19:03:27	1.432
@@ -443,7 +443,7 @@
   sv = SvRV (sv);
 
   // very important shortcut
-  if (expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
+  if (ecb_expect_true (SvMAGIC (sv) && SvMAGIC (sv)->mg_type == PERL_MAGIC_ext))
     return (long)SvMAGIC (sv)->mg_ptr;
 
   if (MAGIC *mg = mg_find (sv, PERL_MAGIC_ext))
@@ -464,7 +464,7 @@
 ecb_noinline static long
 SvPTR_ornull (SV *sv, const char *klass)
 {
-  if (expect_false (!SvOK (sv))) return 0;
+  if (ecb_expect_false (!SvOK (sv))) return 0;
 
   return SvPTR (sv, klass);
 }
@@ -472,7 +472,7 @@
 ecb_noinline static long
 SvPTR_ornull_client (SV *sv)
 {
-  if (expect_false (!SvOK (sv))) return 0;
+  if (ecb_expect_false (!SvOK (sv))) return 0;
 
   if (!SvROK (sv)
       || (SvSTASH (SvRV (sv)) != stash_cf_client_wrap
@@ -485,7 +485,7 @@
 ecb_noinline static long
 SvPTR_ornull_object (SV *sv)
 {
-  if (expect_false (!SvOK (sv))) return 0;
+  if (ecb_expect_false (!SvOK (sv))) return 0;
 
   if (!SvROK (sv)
       || (SvSTASH (SvRV (sv)) != stash_cf_object_wrap
@@ -500,7 +500,7 @@
 ecb_noinline static long
 SvPTR_ornull_maptile (SV *sv)
 {
-  if (expect_false (!SvOK (sv))) return 0;
+  if (ecb_expect_false (!SvOK (sv))) return 0;
 
   if (!SvROK (sv)
       || (SvSTASH (SvRV (sv)) != stash_cf_map_wrap
@@ -514,7 +514,7 @@
 ecb_noinline static long
 SvPTR_ornull_player (SV *sv)
 {
-  if (expect_false (!SvOK (sv))) return 0;
+  if (ecb_expect_false (!SvOK (sv))) return 0;
 
   if (!SvROK (sv)
       || (SvSTASH (SvRV (sv)) != stash_cf_player_wrap
@@ -735,7 +735,7 @@
 cf_obj_to (SV *arg, type &var)
 {
   sv_to (arg, var);
-  if (expect_false (!var))
+  if (ecb_expect_false (!var))
     croak ("must not pass invalid/null cf_obj here");
 }
 
@@ -746,7 +746,7 @@
   if (SvOK (arg))
     {
       sv_to (arg, var);
-      if (expect_false (!var))
+      if (ecb_expect_false (!var))
         croak ("unable to convert perl object to C++ object");
     }
   else