Blind (untested) integrate of mainline.

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

diff --git a/objXSUB.h b/objXSUB.h
index 2549344..99d9a3e 100644 (file)
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -228,6 +228,10 @@
 #define Perl_fprintf_nocontext pPerl->Perl_fprintf_nocontext
 #undef  fprintf_nocontext
 #define fprintf_nocontext      Perl_fprintf_nocontext
+#undef  Perl_printf_nocontext
+#define Perl_printf_nocontext  pPerl->Perl_printf_nocontext
+#undef  printf_nocontext
+#define printf_nocontext       Perl_printf_nocontext
 #endif
 #undef  Perl_cv_const_sv
 #define Perl_cv_const_sv       pPerl->Perl_cv_const_sv
@@ -910,6 +914,10 @@
 #define Perl_my_popen          pPerl->Perl_my_popen
 #undef  my_popen
 #define my_popen               Perl_my_popen
+#undef  Perl_my_popen_list
+#define Perl_my_popen_list     pPerl->Perl_my_popen_list
+#undef  my_popen_list
+#define my_popen_list          Perl_my_popen_list
 #endif
 #undef  Perl_my_setenv
 #define Perl_my_setenv         pPerl->Perl_my_setenv
@@ -1425,6 +1433,10 @@
 #define Perl_save_long         pPerl->Perl_save_long
 #undef  save_long
 #define save_long              Perl_save_long
+#undef  Perl_save_mortalizesv
+#define Perl_save_mortalizesv  pPerl->Perl_save_mortalizesv
+#undef  save_mortalizesv
+#define save_mortalizesv       Perl_save_mortalizesv
 #undef  Perl_save_nogv
 #define Perl_save_nogv         pPerl->Perl_save_nogv
 #undef  save_nogv
@@ -1901,18 +1913,30 @@
 #define Perl_bytes_to_utf8     pPerl->Perl_bytes_to_utf8
 #undef  bytes_to_utf8
 #define bytes_to_utf8          Perl_bytes_to_utf8
-#undef  Perl_utf8_to_uv_simple
-#define Perl_utf8_to_uv_simple pPerl->Perl_utf8_to_uv_simple
-#undef  utf8_to_uv_simple
-#define utf8_to_uv_simple      Perl_utf8_to_uv_simple
-#undef  Perl_utf8_to_uv
-#define Perl_utf8_to_uv                pPerl->Perl_utf8_to_uv
-#undef  utf8_to_uv
-#define utf8_to_uv             Perl_utf8_to_uv
-#undef  Perl_uv_to_utf8
-#define Perl_uv_to_utf8                pPerl->Perl_uv_to_utf8
-#undef  uv_to_utf8
-#define uv_to_utf8             Perl_uv_to_utf8
+#undef  Perl_utf8_to_uvchr
+#define Perl_utf8_to_uvchr     pPerl->Perl_utf8_to_uvchr
+#undef  utf8_to_uvchr
+#define utf8_to_uvchr          Perl_utf8_to_uvchr
+#undef  Perl_utf8_to_uvuni
+#define Perl_utf8_to_uvuni     pPerl->Perl_utf8_to_uvuni
+#undef  utf8_to_uvuni
+#define utf8_to_uvuni          Perl_utf8_to_uvuni
+#undef  Perl_utf8n_to_uvchr
+#define Perl_utf8n_to_uvchr    pPerl->Perl_utf8n_to_uvchr
+#undef  utf8n_to_uvchr
+#define utf8n_to_uvchr         Perl_utf8n_to_uvchr
+#undef  Perl_utf8n_to_uvuni
+#define Perl_utf8n_to_uvuni    pPerl->Perl_utf8n_to_uvuni
+#undef  utf8n_to_uvuni
+#define utf8n_to_uvuni         Perl_utf8n_to_uvuni
+#undef  Perl_uvchr_to_utf8
+#define Perl_uvchr_to_utf8     pPerl->Perl_uvchr_to_utf8
+#undef  uvchr_to_utf8
+#define uvchr_to_utf8          Perl_uvchr_to_utf8
+#undef  Perl_uvuni_to_utf8
+#define Perl_uvuni_to_utf8     pPerl->Perl_uvuni_to_utf8
+#undef  uvuni_to_utf8
+#define uvuni_to_utf8          Perl_uvuni_to_utf8
 #undef  Perl_warn
 #define Perl_warn              pPerl->Perl_warn
 #undef  warn
@@ -2339,8 +2363,6 @@
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
 #  if defined(LEAKTEST)
 #  endif
-#  if defined(EBCDIC)
-#  endif
 #endif
 #if defined(PERL_OBJECT)
 #endif