X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=objXSUB.h;h=d9d73b723b84b2a864ed99056c2fde4933cf9bad;hb=1cc8b4c566f7901a54e4b576f09608beb4c81f86;hp=564bd9c4ab66cb9ac169605c3c231fbca30e4ac8;hpb=52e18b1f277416a33dff2c066a83fdab0520a2d7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/objXSUB.h b/objXSUB.h
index 564bd9c..d9d73b7 100644
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -157,7 +157,7 @@
 #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
@@ -383,7 +383,7 @@
 #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
@@ -819,7 +819,7 @@
 #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
@@ -1209,7 +1209,7 @@
 #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
@@ -1915,7 +1915,7 @@
 #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
@@ -2061,7 +2061,7 @@
 #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
@@ -2339,6 +2339,16 @@
 #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
@@ -2363,7 +2373,7 @@
 #  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)
@@ -2392,6 +2402,36 @@
 #endif
 #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT)
 #endif
+#if defined(USE_ITHREADS) && (defined(PERL_IN_SHAREDSV_C) || defined(PERL_DECL_PROT))
+#undef  Perl_sharedsv_init
+#define Perl_sharedsv_init	pPerl->Perl_sharedsv_init
+#undef  sharedsv_init
+#define sharedsv_init		Perl_sharedsv_init
+#undef  Perl_sharedsv_new
+#define Perl_sharedsv_new	pPerl->Perl_sharedsv_new
+#undef  sharedsv_new
+#define sharedsv_new		Perl_sharedsv_new
+#undef  Perl_sharedsv_find
+#define Perl_sharedsv_find	pPerl->Perl_sharedsv_find
+#undef  sharedsv_find
+#define sharedsv_find		Perl_sharedsv_find
+#undef  Perl_sharedsv_lock
+#define Perl_sharedsv_lock	pPerl->Perl_sharedsv_lock
+#undef  sharedsv_lock
+#define sharedsv_lock		Perl_sharedsv_lock
+#undef  Perl_sharedsv_unlock
+#define Perl_sharedsv_unlock	pPerl->Perl_sharedsv_unlock
+#undef  sharedsv_unlock
+#define sharedsv_unlock		Perl_sharedsv_unlock
+#undef  Perl_sharedsv_thrcnt_inc
+#define Perl_sharedsv_thrcnt_inc	pPerl->Perl_sharedsv_thrcnt_inc
+#undef  sharedsv_thrcnt_inc
+#define sharedsv_thrcnt_inc	Perl_sharedsv_thrcnt_inc
+#undef  Perl_sharedsv_thrcnt_dec
+#define Perl_sharedsv_thrcnt_dec	pPerl->Perl_sharedsv_thrcnt_dec
+#undef  sharedsv_thrcnt_dec
+#define sharedsv_thrcnt_dec	Perl_sharedsv_thrcnt_dec
+#endif
 #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
 #  ifdef DEBUGGING
 #  endif