Integrate mainline

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

diff --git a/embed.h b/embed.h
index fe0b6b3..9a8e442 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -853,6 +853,8 @@
 #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
@@ -910,7 +912,9 @@
 #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
@@ -1098,6 +1102,9 @@
 #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
@@ -1156,6 +1163,9 @@
 #  if defined(LEAKTEST)
 #define xstat                  S_xstat
 #  endif
+#  if defined(EBCDIC)
+#define ebcdic_control         Perl_ebcdic_control
+#  endif
 #endif
 #if defined(PERL_OBJECT)
 #endif
@@ -2325,6 +2335,8 @@
 #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)
@@ -2382,7 +2394,9 @@
 #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)
@@ -2569,6 +2583,9 @@
 #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)
@@ -2627,6 +2644,9 @@
 #  if defined(LEAKTEST)
 #define xstat(a)               S_xstat(aTHX_ a)
 #  endif
+#  if defined(EBCDIC)
+#define ebcdic_control(a)      Perl_ebcdic_control(aTHX_ a)
+#  endif
 #endif
 #if defined(PERL_OBJECT)
 #endif
@@ -4561,6 +4581,10 @@
 #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
@@ -4658,8 +4682,10 @@
 #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
@@ -4998,6 +5024,10 @@
 #  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
@@ -5100,6 +5130,10 @@
 #define S_xstat                        CPerlObj::S_xstat
 #define xstat                  S_xstat
 #  endif
+#  if defined(EBCDIC)
+#define Perl_ebcdic_control    CPerlObj::Perl_ebcdic_control
+#define ebcdic_control         Perl_ebcdic_control
+#  endif
 #endif
 #if defined(PERL_OBJECT)
 #endif