Help -Dt show correct pad variables
[p5sagit/p5-mst-13.2.git] / embed.h
diff --git a/embed.h b/embed.h
index c7314bb..ff6ffee 100644 (file)
--- a/embed.h
+++ b/embed.h
 #define sv_catpvf_mg_nocontext Perl_sv_catpvf_mg_nocontext
 #define sv_setpvf_mg_nocontext Perl_sv_setpvf_mg_nocontext
 #define fprintf_nocontext      Perl_fprintf_nocontext
+#define printf_nocontext       Perl_printf_nocontext
 #endif
 #define cv_ckproto             Perl_cv_ckproto
 #define cv_clone               Perl_cv_clone
 #define ingroup                        Perl_ingroup
 #define init_debugger          Perl_init_debugger
 #define init_stacks            Perl_init_stacks
+#define init_tm                        Perl_init_tm
 #define intro_my               Perl_intro_my
 #define instr                  Perl_instr
 #define io_close               Perl_io_close
 #define mg_magical             Perl_mg_magical
 #define mg_set                 Perl_mg_set
 #define mg_size                        Perl_mg_size
+#define mini_mktime            Perl_mini_mktime
 #define mod                    Perl_mod
 #define mode_from_discipline   Perl_mode_from_discipline
 #define moreswitches           Perl_moreswitches
 #if !defined(PERL_OBJECT)
 #define my_pclose              Perl_my_pclose
 #define my_popen               Perl_my_popen
+#define my_popen_list          Perl_my_popen_list
 #endif
 #define my_setenv              Perl_my_setenv
 #define my_stat                        Perl_my_stat
+#define my_strftime            Perl_my_strftime
 #if defined(MYSWAP)
 #define my_swap                        Perl_my_swap
 #define my_htonl               Perl_my_htonl
 #define save_iv                        Perl_save_iv
 #define save_list              Perl_save_list
 #define save_long              Perl_save_long
+#define save_mortalizesv       Perl_save_mortalizesv
 #define save_nogv              Perl_save_nogv
 #define save_op                        Perl_save_op
 #define save_scalar            Perl_save_scalar
 #define sv_setuv               Perl_sv_setuv
 #define sv_setnv               Perl_sv_setnv
 #define sv_setref_iv           Perl_sv_setref_iv
+#define sv_setref_uv           Perl_sv_setref_uv
 #define sv_setref_nv           Perl_sv_setref_nv
 #define sv_setref_pv           Perl_sv_setref_pv
 #define sv_setref_pvn          Perl_sv_setref_pvn
 #define utf8_distance          Perl_utf8_distance
 #define utf8_hop               Perl_utf8_hop
 #define utf8_to_bytes          Perl_utf8_to_bytes
+#define bytes_from_utf8                Perl_bytes_from_utf8
 #define bytes_to_utf8          Perl_bytes_to_utf8
-#define utf8_to_uv_simple      Perl_utf8_to_uv_simple
-#define utf8_to_uv             Perl_utf8_to_uv
-#define uv_to_utf8             Perl_uv_to_utf8
+#define utf8_to_uvchr          Perl_utf8_to_uvchr
+#define utf8_to_uvuni          Perl_utf8_to_uvuni
+#define utf8n_to_uvchr         Perl_utf8n_to_uvchr
+#define utf8n_to_uvuni         Perl_utf8n_to_uvuni
+#define uvchr_to_utf8          Perl_uvchr_to_utf8
+#define uvuni_to_utf8          Perl_uvuni_to_utf8
 #define vivify_defelem         Perl_vivify_defelem
 #define vivify_ref             Perl_vivify_ref
 #define wait4pid               Perl_wait4pid
 #define yyerror                        Perl_yyerror
 #ifdef USE_PURE_BISON
 #define yylex_r                        Perl_yylex_r
-#define yylex                  Perl_yylex
-#else
-#define yylex                  Perl_yylex
 #endif
+#define yylex                  Perl_yylex
 #define yyparse                        Perl_yyparse
 #define yywarn                 Perl_yywarn
 #if defined(MYMALLOC)
 #define ptr_table_fetch                Perl_ptr_table_fetch
 #define ptr_table_store                Perl_ptr_table_store
 #define ptr_table_split                Perl_ptr_table_split
+#define ptr_table_clear                Perl_ptr_table_clear
+#define ptr_table_free         Perl_ptr_table_free
 #endif
 #if defined(HAVE_INTERP_INTERN)
 #define sys_intern_clear       Perl_sys_intern_clear
 #endif
 #if defined(PERL_IN_GV_C) || defined(PERL_DECL_PROT)
 #define gv_init_sv             S_gv_init_sv
+#define require_errno          S_require_errno
 #endif
 #if defined(PERL_IN_HV_C) || defined(PERL_DECL_PROT)
 #define hsplit                 S_hsplit
 #define scalarboolean          S_scalarboolean
 #define too_few_arguments      S_too_few_arguments
 #define too_many_arguments     S_too_many_arguments
-#define trlist_upgrade         S_trlist_upgrade
 #define op_clear               S_op_clear
 #define null                   S_null
 #define pad_addlex             S_pad_addlex
 #define simplify_sort          S_simplify_sort
 #define is_handle_constructor  S_is_handle_constructor
 #define gv_ename               S_gv_ename
+#  if defined(DEBUG_CLOSURES)
 #define cv_dump                        S_cv_dump
+#  endif
 #define cv_clone2              S_cv_clone2
 #define scalar_mod_type                S_scalar_mod_type
 #define my_kid                 S_my_kid
 #define dopoptoloop            S_dopoptoloop
 #define dopoptosub             S_dopoptosub
 #define dopoptosub_at          S_dopoptosub_at
-#define free_closures          S_free_closures
 #define save_lines             S_save_lines
 #define doeval                 S_doeval
 #define doopen_pmc             S_doopen_pmc
 #define find_byclass           S_find_byclass
 #endif
 #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT)
+#define deb_curcv              S_deb_curcv
 #define debprof                        S_debprof
 #endif
 #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT)
 #define sv_2inuv_non_preserve  S_sv_2inuv_non_preserve
 #define sv_2iuv_non_preserve   S_sv_2iuv_non_preserve
 #  endif
+#define expect_number          S_expect_number
+#  if defined(USE_ITHREADS)
+#define gv_share               S_gv_share
+#  endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
 #define check_uni              S_check_uni
 #define filter_gets            S_filter_gets
 #define find_in_my_stash       S_find_in_my_stash
 #define new_constant           S_new_constant
+#define tokereport             S_tokereport
 #define ao                     S_ao
 #define depcom                 S_depcom
 #define incl_perldb            S_incl_perldb
 #define ingroup(a,b)           Perl_ingroup(aTHX_ a,b)
 #define init_debugger()                Perl_init_debugger(aTHX)
 #define init_stacks()          Perl_init_stacks(aTHX)
+#define init_tm(a)             Perl_init_tm(aTHX_ a)
 #define intro_my()             Perl_intro_my(aTHX)
 #define instr(a,b)             Perl_instr(aTHX_ a,b)
 #define io_close(a,b)          Perl_io_close(aTHX_ a,b)
 #define mg_magical(a)          Perl_mg_magical(aTHX_ a)
 #define mg_set(a)              Perl_mg_set(aTHX_ a)
 #define mg_size(a)             Perl_mg_size(aTHX_ a)
+#define mini_mktime(a)         Perl_mini_mktime(aTHX_ a)
 #define mod(a,b)               Perl_mod(aTHX_ a,b)
 #define mode_from_discipline(a)        Perl_mode_from_discipline(aTHX_ a)
 #define moreswitches(a)                Perl_moreswitches(aTHX_ a)
 #if !defined(PERL_OBJECT)
 #define my_pclose(a)           Perl_my_pclose(aTHX_ a)
 #define my_popen(a,b)          Perl_my_popen(aTHX_ a,b)
+#define my_popen_list(a,b,c)   Perl_my_popen_list(aTHX_ a,b,c)
 #endif
 #define my_setenv(a,b)         Perl_my_setenv(aTHX_ a,b)
 #define my_stat()              Perl_my_stat(aTHX)
+#define my_strftime(a,b,c,d,e,f,g,h,i,j)       Perl_my_strftime(aTHX_ a,b,c,d,e,f,g,h,i,j)
 #if defined(MYSWAP)
 #define my_swap(a)             Perl_my_swap(aTHX_ a)
 #define my_htonl(a)            Perl_my_htonl(aTHX_ a)
 #define save_iv(a)             Perl_save_iv(aTHX_ a)
 #define save_list(a,b)         Perl_save_list(aTHX_ a,b)
 #define save_long(a)           Perl_save_long(aTHX_ a)
+#define save_mortalizesv(a)    Perl_save_mortalizesv(aTHX_ a)
 #define save_nogv(a)           Perl_save_nogv(aTHX_ a)
 #define save_op()              Perl_save_op(aTHX)
 #define save_scalar(a)         Perl_save_scalar(aTHX_ a)
 #define sv_setuv(a,b)          Perl_sv_setuv(aTHX_ a,b)
 #define sv_setnv(a,b)          Perl_sv_setnv(aTHX_ a,b)
 #define sv_setref_iv(a,b,c)    Perl_sv_setref_iv(aTHX_ a,b,c)
+#define sv_setref_uv(a,b,c)    Perl_sv_setref_uv(aTHX_ a,b,c)
 #define sv_setref_nv(a,b,c)    Perl_sv_setref_nv(aTHX_ a,b,c)
 #define sv_setref_pv(a,b,c)    Perl_sv_setref_pv(aTHX_ a,b,c)
 #define sv_setref_pvn(a,b,c,d) Perl_sv_setref_pvn(aTHX_ a,b,c,d)
 #define sv_vsetpvfn(a,b,c,d,e,f,g)     Perl_sv_vsetpvfn(aTHX_ a,b,c,d,e,f,g)
 #define str_to_version(a)      Perl_str_to_version(aTHX_ a)
 #define swash_init(a,b,c,d,e)  Perl_swash_init(aTHX_ a,b,c,d,e)
-#define swash_fetch(a,b)       Perl_swash_fetch(aTHX_ a,b)
+#define swash_fetch(a,b,c)     Perl_swash_fetch(aTHX_ a,b,c)
 #define taint_env()            Perl_taint_env(aTHX)
 #define taint_proper(a,b)      Perl_taint_proper(aTHX_ a,b)
 #define to_utf8_lower(a)       Perl_to_utf8_lower(aTHX_ a)
 #define utf8_distance(a,b)     Perl_utf8_distance(aTHX_ a,b)
 #define utf8_hop(a,b)          Perl_utf8_hop(aTHX_ a,b)
 #define utf8_to_bytes(a,b)     Perl_utf8_to_bytes(aTHX_ a,b)
+#define bytes_from_utf8(a,b,c) Perl_bytes_from_utf8(aTHX_ a,b,c)
 #define bytes_to_utf8(a,b)     Perl_bytes_to_utf8(aTHX_ a,b)
-#define utf8_to_uv_simple(a,b) Perl_utf8_to_uv_simple(aTHX_ a,b)
-#define utf8_to_uv(a,b,c,d)    Perl_utf8_to_uv(aTHX_ a,b,c,d)
-#define uv_to_utf8(a,b)                Perl_uv_to_utf8(aTHX_ a,b)
+#define utf8_to_uvchr(a,b)     Perl_utf8_to_uvchr(aTHX_ a,b)
+#define utf8_to_uvuni(a,b)     Perl_utf8_to_uvuni(aTHX_ a,b)
+#define utf8n_to_uvchr(a,b,c,d)        Perl_utf8n_to_uvchr(aTHX_ a,b,c,d)
+#define utf8n_to_uvuni(a,b,c,d)        Perl_utf8n_to_uvuni(aTHX_ a,b,c,d)
+#define uvchr_to_utf8(a,b)     Perl_uvchr_to_utf8(aTHX_ a,b)
+#define uvuni_to_utf8(a,b)     Perl_uvuni_to_utf8(aTHX_ a,b)
 #define vivify_defelem(a)      Perl_vivify_defelem(aTHX_ a)
 #define vivify_ref(a,b)                Perl_vivify_ref(aTHX_ a,b)
 #define wait4pid(a,b,c)                Perl_wait4pid(aTHX_ a,b,c)
 #define yyerror(a)             Perl_yyerror(aTHX_ a)
 #ifdef USE_PURE_BISON
 #define yylex_r(a,b)           Perl_yylex_r(aTHX_ a,b)
-#define yylex(a,b)             Perl_yylex(aTHX_ a,b)
-#else
-#define yylex()                        Perl_yylex(aTHX)
 #endif
+#define yylex()                        Perl_yylex(aTHX)
 #define yyparse()              Perl_yyparse(aTHX)
 #define yywarn(a)              Perl_yywarn(aTHX_ a)
 #if defined(MYMALLOC)
 #define ptr_table_fetch(a,b)   Perl_ptr_table_fetch(aTHX_ a,b)
 #define ptr_table_store(a,b,c) Perl_ptr_table_store(aTHX_ a,b,c)
 #define ptr_table_split(a)     Perl_ptr_table_split(aTHX_ a)
+#define ptr_table_clear(a)     Perl_ptr_table_clear(aTHX_ a)
+#define ptr_table_free(a)      Perl_ptr_table_free(aTHX_ a)
 #endif
 #if defined(HAVE_INTERP_INTERN)
 #define sys_intern_clear()     Perl_sys_intern_clear(aTHX)
 #endif
 #if defined(PERL_IN_GV_C) || defined(PERL_DECL_PROT)
 #define gv_init_sv(a,b)                S_gv_init_sv(aTHX_ a,b)
+#define require_errno(a)       S_require_errno(aTHX_ a)
 #endif
 #if defined(PERL_IN_HV_C) || defined(PERL_DECL_PROT)
 #define hsplit(a)              S_hsplit(aTHX_ a)
 #define scalarboolean(a)       S_scalarboolean(aTHX_ a)
 #define too_few_arguments(a,b) S_too_few_arguments(aTHX_ a,b)
 #define too_many_arguments(a,b)        S_too_many_arguments(aTHX_ a,b)
-#define trlist_upgrade(a,b)    S_trlist_upgrade(aTHX_ a,b)
 #define op_clear(a)            S_op_clear(aTHX_ a)
 #define null(a)                        S_null(aTHX_ a)
 #define pad_addlex(a)          S_pad_addlex(aTHX_ a)
 #define simplify_sort(a)       S_simplify_sort(aTHX_ a)
 #define is_handle_constructor(a,b)     S_is_handle_constructor(aTHX_ a,b)
 #define gv_ename(a)            S_gv_ename(aTHX_ a)
+#  if defined(DEBUG_CLOSURES)
 #define cv_dump(a)             S_cv_dump(aTHX_ a)
+#  endif
 #define cv_clone2(a,b)         S_cv_clone2(aTHX_ a,b)
 #define scalar_mod_type(a,b)   S_scalar_mod_type(aTHX_ a,b)
 #define my_kid(a,b)            S_my_kid(aTHX_ a,b)
 #define dopoptoloop(a)         S_dopoptoloop(aTHX_ a)
 #define dopoptosub(a)          S_dopoptosub(aTHX_ a)
 #define dopoptosub_at(a,b)     S_dopoptosub_at(aTHX_ a,b)
-#define free_closures()                S_free_closures(aTHX)
 #define save_lines(a,b)                S_save_lines(aTHX_ a,b)
 #define doeval(a,b)            S_doeval(aTHX_ a,b)
 #define doopen_pmc(a,b)                S_doopen_pmc(aTHX_ a,b)
 #define find_byclass(a,b,c,d,e,f)      S_find_byclass(aTHX_ a,b,c,d,e,f)
 #endif
 #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT)
+#define deb_curcv(a)           S_deb_curcv(aTHX_ a)
 #define debprof(a)             S_debprof(aTHX_ a)
 #endif
 #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT)
 #define sv_2inuv_non_preserve(a,b)     S_sv_2inuv_non_preserve(aTHX_ a,b)
 #define sv_2iuv_non_preserve(a,b)      S_sv_2iuv_non_preserve(aTHX_ a,b)
 #  endif
+#define expect_number(a)       S_expect_number(aTHX_ a)
+#  if defined(USE_ITHREADS)
+#define gv_share(a)            S_gv_share(aTHX_ a)
+#  endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
 #define check_uni()            S_check_uni(aTHX)
 #define filter_gets(a,b,c)     S_filter_gets(aTHX_ a,b,c)
 #define find_in_my_stash(a,b)  S_find_in_my_stash(aTHX_ a,b)
 #define new_constant(a,b,c,d,e,f)      S_new_constant(aTHX_ a,b,c,d,e,f)
+#define tokereport(a,b,c)      S_tokereport(aTHX_ a,b,c)
 #define ao(a)                  S_ao(aTHX_ a)
 #define depcom()               S_depcom(aTHX)
 #define incl_perldb()          S_incl_perldb(aTHX)
 #define sv_setpvf_mg_nocontext Perl_sv_setpvf_mg_nocontext
 #define Perl_fprintf_nocontext CPerlObj::Perl_fprintf_nocontext
 #define fprintf_nocontext      Perl_fprintf_nocontext
+#define Perl_printf_nocontext  CPerlObj::Perl_printf_nocontext
+#define printf_nocontext       Perl_printf_nocontext
 #endif
 #define Perl_cv_ckproto                CPerlObj::Perl_cv_ckproto
 #define cv_ckproto             Perl_cv_ckproto
 #define init_debugger          Perl_init_debugger
 #define Perl_init_stacks       CPerlObj::Perl_init_stacks
 #define init_stacks            Perl_init_stacks
+#define Perl_init_tm           CPerlObj::Perl_init_tm
+#define init_tm                        Perl_init_tm
 #define Perl_intro_my          CPerlObj::Perl_intro_my
 #define intro_my               Perl_intro_my
 #define Perl_instr             CPerlObj::Perl_instr
 #define mg_set                 Perl_mg_set
 #define Perl_mg_size           CPerlObj::Perl_mg_size
 #define mg_size                        Perl_mg_size
+#define Perl_mini_mktime       CPerlObj::Perl_mini_mktime
+#define mini_mktime            Perl_mini_mktime
 #define Perl_mod               CPerlObj::Perl_mod
 #define mod                    Perl_mod
 #define Perl_mode_from_discipline      CPerlObj::Perl_mode_from_discipline
 #define my_pclose              Perl_my_pclose
 #define Perl_my_popen          CPerlObj::Perl_my_popen
 #define my_popen               Perl_my_popen
+#define Perl_my_popen_list     CPerlObj::Perl_my_popen_list
+#define my_popen_list          Perl_my_popen_list
 #endif
 #define Perl_my_setenv         CPerlObj::Perl_my_setenv
 #define my_setenv              Perl_my_setenv
 #define Perl_my_stat           CPerlObj::Perl_my_stat
 #define my_stat                        Perl_my_stat
+#define Perl_my_strftime       CPerlObj::Perl_my_strftime
+#define my_strftime            Perl_my_strftime
 #if defined(MYSWAP)
 #define Perl_my_swap           CPerlObj::Perl_my_swap
 #define my_swap                        Perl_my_swap
 #define save_list              Perl_save_list
 #define Perl_save_long         CPerlObj::Perl_save_long
 #define save_long              Perl_save_long
+#define Perl_save_mortalizesv  CPerlObj::Perl_save_mortalizesv
+#define save_mortalizesv       Perl_save_mortalizesv
 #define Perl_save_nogv         CPerlObj::Perl_save_nogv
 #define save_nogv              Perl_save_nogv
 #define Perl_save_op           CPerlObj::Perl_save_op
 #define sv_setnv               Perl_sv_setnv
 #define Perl_sv_setref_iv      CPerlObj::Perl_sv_setref_iv
 #define sv_setref_iv           Perl_sv_setref_iv
+#define Perl_sv_setref_uv      CPerlObj::Perl_sv_setref_uv
+#define sv_setref_uv           Perl_sv_setref_uv
 #define Perl_sv_setref_nv      CPerlObj::Perl_sv_setref_nv
 #define sv_setref_nv           Perl_sv_setref_nv
 #define Perl_sv_setref_pv      CPerlObj::Perl_sv_setref_pv
 #define utf8_hop               Perl_utf8_hop
 #define Perl_utf8_to_bytes     CPerlObj::Perl_utf8_to_bytes
 #define utf8_to_bytes          Perl_utf8_to_bytes
+#define Perl_bytes_from_utf8   CPerlObj::Perl_bytes_from_utf8
+#define bytes_from_utf8                Perl_bytes_from_utf8
 #define Perl_bytes_to_utf8     CPerlObj::Perl_bytes_to_utf8
 #define bytes_to_utf8          Perl_bytes_to_utf8
-#define Perl_utf8_to_uv_simple CPerlObj::Perl_utf8_to_uv_simple
-#define utf8_to_uv_simple      Perl_utf8_to_uv_simple
-#define Perl_utf8_to_uv                CPerlObj::Perl_utf8_to_uv
-#define utf8_to_uv             Perl_utf8_to_uv
-#define Perl_uv_to_utf8                CPerlObj::Perl_uv_to_utf8
-#define uv_to_utf8             Perl_uv_to_utf8
+#define Perl_utf8_to_uvchr     CPerlObj::Perl_utf8_to_uvchr
+#define utf8_to_uvchr          Perl_utf8_to_uvchr
+#define Perl_utf8_to_uvuni     CPerlObj::Perl_utf8_to_uvuni
+#define utf8_to_uvuni          Perl_utf8_to_uvuni
+#define Perl_utf8n_to_uvchr    CPerlObj::Perl_utf8n_to_uvchr
+#define utf8n_to_uvchr         Perl_utf8n_to_uvchr
+#define Perl_utf8n_to_uvuni    CPerlObj::Perl_utf8n_to_uvuni
+#define utf8n_to_uvuni         Perl_utf8n_to_uvuni
+#define Perl_uvchr_to_utf8     CPerlObj::Perl_uvchr_to_utf8
+#define uvchr_to_utf8          Perl_uvchr_to_utf8
+#define Perl_uvuni_to_utf8     CPerlObj::Perl_uvuni_to_utf8
+#define uvuni_to_utf8          Perl_uvuni_to_utf8
 #define Perl_vivify_defelem    CPerlObj::Perl_vivify_defelem
 #define vivify_defelem         Perl_vivify_defelem
 #define Perl_vivify_ref                CPerlObj::Perl_vivify_ref
 #ifdef USE_PURE_BISON
 #define Perl_yylex_r           CPerlObj::Perl_yylex_r
 #define yylex_r                        Perl_yylex_r
+#endif
 #define Perl_yylex             CPerlObj::Perl_yylex
 #define yylex                  Perl_yylex
-#else
-#define Perl_yylex             CPerlObj::Perl_yylex
-#define yylex                  Perl_yylex
-#endif
 #define Perl_yyparse           CPerlObj::Perl_yyparse
 #define yyparse                        Perl_yyparse
 #define Perl_yywarn            CPerlObj::Perl_yywarn
 #define ptr_table_store                Perl_ptr_table_store
 #define Perl_ptr_table_split   CPerlObj::Perl_ptr_table_split
 #define ptr_table_split                Perl_ptr_table_split
+#define Perl_ptr_table_clear   CPerlObj::Perl_ptr_table_clear
+#define ptr_table_clear                Perl_ptr_table_clear
+#define Perl_ptr_table_free    CPerlObj::Perl_ptr_table_free
+#define ptr_table_free         Perl_ptr_table_free
 #endif
 #if defined(HAVE_INTERP_INTERN)
 #define Perl_sys_intern_clear  CPerlObj::Perl_sys_intern_clear
 #if defined(PERL_IN_GV_C) || defined(PERL_DECL_PROT)
 #define S_gv_init_sv           CPerlObj::S_gv_init_sv
 #define gv_init_sv             S_gv_init_sv
+#define S_require_errno                CPerlObj::S_require_errno
+#define require_errno          S_require_errno
 #endif
 #if defined(PERL_IN_HV_C) || defined(PERL_DECL_PROT)
 #define S_hsplit               CPerlObj::S_hsplit
 #define too_few_arguments      S_too_few_arguments
 #define S_too_many_arguments   CPerlObj::S_too_many_arguments
 #define too_many_arguments     S_too_many_arguments
-#define S_trlist_upgrade       CPerlObj::S_trlist_upgrade
-#define trlist_upgrade         S_trlist_upgrade
 #define S_op_clear             CPerlObj::S_op_clear
 #define op_clear               S_op_clear
 #define S_null                 CPerlObj::S_null
 #define is_handle_constructor  S_is_handle_constructor
 #define S_gv_ename             CPerlObj::S_gv_ename
 #define gv_ename               S_gv_ename
+#  if defined(DEBUG_CLOSURES)
 #define S_cv_dump              CPerlObj::S_cv_dump
 #define cv_dump                        S_cv_dump
+#  endif
 #define S_cv_clone2            CPerlObj::S_cv_clone2
 #define cv_clone2              S_cv_clone2
 #define S_scalar_mod_type      CPerlObj::S_scalar_mod_type
 #define dopoptosub             S_dopoptosub
 #define S_dopoptosub_at                CPerlObj::S_dopoptosub_at
 #define dopoptosub_at          S_dopoptosub_at
-#define S_free_closures                CPerlObj::S_free_closures
-#define free_closures          S_free_closures
 #define S_save_lines           CPerlObj::S_save_lines
 #define save_lines             S_save_lines
 #define S_doeval               CPerlObj::S_doeval
 #define find_byclass           S_find_byclass
 #endif
 #if defined(PERL_IN_RUN_C) || defined(PERL_DECL_PROT)
+#define S_deb_curcv            CPerlObj::S_deb_curcv
+#define deb_curcv              S_deb_curcv
 #define S_debprof              CPerlObj::S_debprof
 #define debprof                        S_debprof
 #endif
 #define S_sv_2iuv_non_preserve CPerlObj::S_sv_2iuv_non_preserve
 #define sv_2iuv_non_preserve   S_sv_2iuv_non_preserve
 #  endif
+#define S_expect_number                CPerlObj::S_expect_number
+#define expect_number          S_expect_number
+#  if defined(USE_ITHREADS)
+#define S_gv_share             CPerlObj::S_gv_share
+#define gv_share               S_gv_share
+#  endif
 #endif
 #if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
 #define S_check_uni            CPerlObj::S_check_uni
 #define find_in_my_stash       S_find_in_my_stash
 #define S_new_constant         CPerlObj::S_new_constant
 #define new_constant           S_new_constant
+#define S_tokereport           CPerlObj::S_tokereport
+#define tokereport             S_tokereport
 #define S_ao                   CPerlObj::S_ao
 #define ao                     S_ao
 #define S_depcom               CPerlObj::S_depcom