cleaner logic in op.c, also avoids QNX optimizer bug (from Norton

[p5sagit/p5-mst-13.2.git] / objXSUB.h

diff --git a/objXSUB.h b/objXSUB.h
index 86200bc..1906a66 100644 (file)
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -47,6 +47,10 @@
 #define Perl_avhv_fetch_ent    pPerl->Perl_avhv_fetch_ent
 #undef  avhv_fetch_ent
 #define avhv_fetch_ent         Perl_avhv_fetch_ent
+#undef  Perl_avhv_store_ent
+#define Perl_avhv_store_ent    pPerl->Perl_avhv_store_ent
+#undef  avhv_store_ent
+#define avhv_store_ent         Perl_avhv_store_ent
 #undef  Perl_avhv_iternext
 #define Perl_avhv_iternext     pPerl->Perl_avhv_iternext
 #undef  avhv_iternext
@@ -184,6 +188,10 @@
 #define Perl_form_nocontext    pPerl->Perl_form_nocontext
 #undef  form_nocontext
 #define form_nocontext         Perl_form_nocontext
+#undef  Perl_load_module_nocontext
+#define Perl_load_module_nocontext     pPerl->Perl_load_module_nocontext
+#undef  load_module_nocontext
+#define load_module_nocontext  Perl_load_module_nocontext
 #undef  Perl_mess_nocontext
 #define Perl_mess_nocontext    pPerl->Perl_mess_nocontext
 #undef  mess_nocontext
@@ -679,6 +687,10 @@
 #define Perl_to_uni_lower_lc   pPerl->Perl_to_uni_lower_lc
 #undef  to_uni_lower_lc
 #define to_uni_lower_lc                Perl_to_uni_lower_lc
+#undef  Perl_is_utf8_char
+#define Perl_is_utf8_char      pPerl->Perl_is_utf8_char
+#undef  is_utf8_char
+#define is_utf8_char           Perl_is_utf8_char
 #undef  Perl_is_utf8_alnum
 #define Perl_is_utf8_alnum     pPerl->Perl_is_utf8_alnum
 #undef  is_utf8_alnum
@@ -743,6 +755,14 @@
 #define Perl_leave_scope       pPerl->Perl_leave_scope
 #undef  leave_scope
 #define leave_scope            Perl_leave_scope
+#undef  Perl_load_module
+#define Perl_load_module       pPerl->Perl_load_module
+#undef  load_module
+#define load_module            Perl_load_module
+#undef  Perl_vload_module
+#define Perl_vload_module      pPerl->Perl_vload_module
+#undef  vload_module
+#define vload_module           Perl_vload_module
 #undef  Perl_looks_like_number
 #define Perl_looks_like_number pPerl->Perl_looks_like_number
 #undef  looks_like_number
@@ -2186,6 +2206,8 @@
 #  endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
+#if 0
+#endif
 #  if defined(CRIPPLED_CC)
 #  endif
 #  if defined(PERL_CR_FILTER)