make the is_utf8_*() safe for use on invalid utf8 (they now

[perl5.git] / objXSUB.h

diff --git a/objXSUB.h b/objXSUB.h
index 36d428f..1906a66 100644 (file)
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -13,7 +13,6 @@
 /* XXX soon to be eliminated, only a few things in PERLCORE need these now */
 
 #if defined(PERL_IMPLICIT_SYS)
-#else
 #endif
 #if defined(USE_ITHREADS)
 #  if defined(PERL_IMPLICIT_SYS)
@@ -48,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
@@ -185,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
@@ -680,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
@@ -744,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
@@ -1738,6 +1757,10 @@
 #define Perl_sv_vsetpvfn       pPerl->Perl_sv_vsetpvfn
 #undef  sv_vsetpvfn
 #define sv_vsetpvfn            Perl_sv_vsetpvfn
+#undef  Perl_str_to_version
+#define Perl_str_to_version    pPerl->Perl_str_to_version
+#undef  str_to_version
+#define str_to_version         Perl_str_to_version
 #undef  Perl_swash_init
 #define Perl_swash_init                pPerl->Perl_swash_init
 #undef  swash_init
@@ -1830,6 +1853,10 @@
 #define Perl_dump_mstats       pPerl->Perl_dump_mstats
 #undef  dump_mstats
 #define dump_mstats            Perl_dump_mstats
+#undef  Perl_get_mstats
+#define Perl_get_mstats                pPerl->Perl_get_mstats
+#undef  get_mstats
+#define get_mstats             Perl_get_mstats
 #endif
 #undef  Perl_safesysmalloc
 #define Perl_safesysmalloc     pPerl->Perl_safesysmalloc
@@ -1983,6 +2010,7 @@
 #define Perl_magic_dump                pPerl->Perl_magic_dump
 #undef  magic_dump
 #define magic_dump             Perl_magic_dump
+#if defined(PERL_FLEXIBLE_EXCEPTIONS)
 #undef  Perl_default_protect
 #define Perl_default_protect   pPerl->Perl_default_protect
 #undef  default_protect
@@ -1991,6 +2019,7 @@
 #define Perl_vdefault_protect  pPerl->Perl_vdefault_protect
 #undef  vdefault_protect
 #define vdefault_protect       Perl_vdefault_protect
+#endif
 #undef  Perl_reginitcolors
 #define Perl_reginitcolors     pPerl->Perl_reginitcolors
 #undef  reginitcolors
@@ -2019,6 +2048,22 @@
 #define Perl_sv_pvbyte         pPerl->Perl_sv_pvbyte
 #undef  sv_pvbyte
 #define sv_pvbyte              Perl_sv_pvbyte
+#undef  Perl_sv_utf8_upgrade
+#define Perl_sv_utf8_upgrade   pPerl->Perl_sv_utf8_upgrade
+#undef  sv_utf8_upgrade
+#define sv_utf8_upgrade                Perl_sv_utf8_upgrade
+#undef  Perl_sv_utf8_downgrade
+#define Perl_sv_utf8_downgrade pPerl->Perl_sv_utf8_downgrade
+#undef  sv_utf8_downgrade
+#define sv_utf8_downgrade      Perl_sv_utf8_downgrade
+#undef  Perl_sv_utf8_encode
+#define Perl_sv_utf8_encode    pPerl->Perl_sv_utf8_encode
+#undef  sv_utf8_encode
+#define sv_utf8_encode         Perl_sv_utf8_encode
+#undef  Perl_sv_utf8_decode
+#define Perl_sv_utf8_decode    pPerl->Perl_sv_utf8_decode
+#undef  sv_utf8_decode
+#define sv_utf8_decode         Perl_sv_utf8_decode
 #undef  Perl_sv_force_normal
 #define Perl_sv_force_normal   pPerl->Perl_sv_force_normal
 #undef  sv_force_normal
@@ -2131,12 +2176,16 @@
 #if defined(PERL_IN_PERL_C) || defined(PERL_DECL_PROT)
 #  if defined(IAMSUID)
 #  endif
+#if defined(PERL_FLEXIBLE_EXCEPTIONS)
+#endif
 #  if defined(USE_THREADS)
 #  endif
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)
 #endif
 #if defined(PERL_IN_PP_CTL_C) || defined(PERL_DECL_PROT)
+#if defined(PERL_FLEXIBLE_EXCEPTIONS)
+#endif
 #endif
 #if defined(PERL_IN_PP_HOT_C) || defined(PERL_DECL_PROT)
 #endif
@@ -2153,13 +2202,12 @@
 #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT)
 #endif
 #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
-#  if defined(PURIFY)
-#  else
-#  endif
 #  if defined(DEBUGGING)
 #  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)