This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Integrate mainline
[perl5.git] / objXSUB.h
index f67daed..d9d73b7 100644 (file)
--- a/objXSUB.h
+++ b/objXSUB.h
 #undef  my_chsize
 #define my_chsize              Perl_my_chsize
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #undef  Perl_condpair_magic
 #define Perl_condpair_magic    pPerl->Perl_condpair_magic
 #undef  condpair_magic
 #define Perl_fbm_instr         pPerl->Perl_fbm_instr
 #undef  fbm_instr
 #define fbm_instr              Perl_fbm_instr
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #endif
 #undef  Perl_form
 #define Perl_form              pPerl->Perl_form
 #define Perl_grok_numeric_radix        pPerl->Perl_grok_numeric_radix
 #undef  grok_numeric_radix
 #define grok_numeric_radix     Perl_grok_numeric_radix
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #endif
 #if defined(USE_LOCALE_COLLATE)
 #endif
 #undef  Perl_parse
 #define Perl_parse             pPerl->Perl_parse
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #undef  Perl_new_struct_thread
 #define Perl_new_struct_thread pPerl->Perl_new_struct_thread
 #undef  new_struct_thread
 #undef  unlnk
 #define unlnk                  Perl_unlnk
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #undef  Perl_unlock_condpair
 #define Perl_unlock_condpair   pPerl->Perl_unlock_condpair
 #undef  unlock_condpair
 #define Perl_runops_debug      pPerl->Perl_runops_debug
 #undef  runops_debug
 #define runops_debug           Perl_runops_debug
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #undef  Perl_sv_lock
 #define Perl_sv_lock           pPerl->Perl_sv_lock
 #undef  sv_lock
 #undef  sys_intern_init
 #define sys_intern_init                Perl_sys_intern_init
 #endif
+#if defined(PERL_CUSTOM_OPS)
+#undef  Perl_custom_op_name
+#define Perl_custom_op_name    pPerl->Perl_custom_op_name
+#undef  custom_op_name
+#define custom_op_name         Perl_custom_op_name
+#undef  Perl_custom_op_desc
+#define Perl_custom_op_desc    pPerl->Perl_custom_op_desc
+#undef  custom_op_desc
+#define custom_op_desc         Perl_custom_op_desc
+#endif
 #if defined(PERL_OBJECT)
 #else
 #endif
 #  endif
 #if defined(PERL_FLEXIBLE_EXCEPTIONS)
 #endif
-#  if defined(USE_THREADS)
+#  if defined(USE_5005THREADS)
 #  endif
 #endif
 #if defined(PERL_IN_PP_C) || defined(PERL_DECL_PROT)