11792 wasn't complete

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

diff --git a/embed.h b/embed.h
index ba67052..941c9b2 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -111,7 +111,7 @@
 #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP)
 #define my_chsize              Perl_my_chsize
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define condpair_magic         Perl_condpair_magic
 #endif
 #define convert                        Perl_convert
@@ -213,7 +213,7 @@
 #define fbm_compile            Perl_fbm_compile
 #define fbm_instr              Perl_fbm_instr
 #define find_script            Perl_find_script
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define find_threadsv          Perl_find_threadsv
 #endif
 #define force_list             Perl_force_list
@@ -366,7 +366,7 @@
 #define magic_getuvar          Perl_magic_getuvar
 #define magic_getvec           Perl_magic_getvec
 #define magic_len              Perl_magic_len
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define magic_mutexfree                Perl_magic_mutexfree
 #endif
 #define magic_nextpack         Perl_magic_nextpack
@@ -430,6 +430,9 @@
 #define my_exit                        Perl_my_exit
 #define my_failure_exit                Perl_my_failure_exit
 #define my_fflush_all          Perl_my_fflush_all
+#define my_fork                        Perl_my_fork
+#define atfork_lock            Perl_atfork_lock
+#define atfork_unlock          Perl_atfork_unlock
 #define my_lstat               Perl_my_lstat
 #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
 #define my_memcmp              Perl_my_memcmp
@@ -521,7 +524,7 @@
 #define peep                   Perl_peep
 #if defined(PERL_OBJECT)
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define new_struct_thread      Perl_new_struct_thread
 #endif
 #define call_atexit            Perl_call_atexit
@@ -733,7 +736,7 @@
 #if defined(UNLINK_ALL_VERSIONS)
 #define unlnk                  Perl_unlnk
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define unlock_condpair                Perl_unlock_condpair
 #endif
 #define unsharepvn             Perl_unsharepvn
@@ -790,7 +793,7 @@
 #endif
 #define runops_standard                Perl_runops_standard
 #define runops_debug           Perl_runops_debug
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define sv_lock                        Perl_sv_lock
 #endif
 #define sv_catpvf_mg           Perl_sv_catpvf_mg
@@ -870,6 +873,10 @@
 #define sys_intern_clear       Perl_sys_intern_clear
 #define sys_intern_init                Perl_sys_intern_init
 #endif
+#if defined(PERL_CUSTOM_OPS)
+#define custom_op_name         Perl_custom_op_name
+#define custom_op_desc         Perl_custom_op_desc
+#endif
 #if defined(PERL_OBJECT)
 #else
 #endif
@@ -961,7 +968,7 @@
 #define vcall_body             S_vcall_body
 #define vcall_list_body                S_vcall_list_body
 #endif
-#  if defined(USE_THREADS)
+#  if defined(USE_5005THREADS)
 #define init_main_thread       S_init_main_thread
 #  endif
 #endif
@@ -1063,6 +1070,16 @@
 #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT)
 #define save_scalar_at         S_save_scalar_at
 #endif
+#if defined(USE_ITHREADS) && (defined(PERL_IN_SHAREDSV_C) || defined(PERL_DECL_PROT))
+#define sharedsv_init          Perl_sharedsv_init
+#define sharedsv_new           Perl_sharedsv_new
+#define sharedsv_find          Perl_sharedsv_find
+#define sharedsv_lock          Perl_sharedsv_lock
+#define sharedsv_unlock                Perl_sharedsv_unlock
+#define sharedsv_unlock_scope  Perl_sharedsv_unlock_scope
+#define sharedsv_thrcnt_inc    Perl_sharedsv_thrcnt_inc
+#define sharedsv_thrcnt_dec    Perl_sharedsv_thrcnt_dec
+#endif
 #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
 #define asIV                   S_asIV
 #define asUV                   S_asUV
@@ -1177,6 +1194,7 @@
 #define stdize_locale          S_stdize_locale
 #endif
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#define closest_cop            S_closest_cop
 #define mess_alloc             S_mess_alloc
 #  if defined(LEAKTEST)
 #define xstat                  S_xstat
@@ -1213,7 +1231,6 @@
 #define ck_match               Perl_ck_match
 #define ck_method              Perl_ck_method
 #define ck_null                        Perl_ck_null
-#define ck_octmode             Perl_ck_octmode
 #define ck_open                        Perl_ck_open
 #define ck_repeat              Perl_ck_repeat
 #define ck_require             Perl_ck_require
@@ -1643,7 +1660,7 @@
 #if !defined(HAS_TRUNCATE) && !defined(HAS_CHSIZE) && defined(F_FREESP)
 #define my_chsize(a,b)         Perl_my_chsize(aTHX_ a,b)
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define condpair_magic(a)      Perl_condpair_magic(aTHX_ a)
 #endif
 #define convert(a,b,c)         Perl_convert(aTHX_ a,b,c)
@@ -1727,7 +1744,7 @@
 #define fbm_compile(a,b)       Perl_fbm_compile(aTHX_ a,b)
 #define fbm_instr(a,b,c,d)     Perl_fbm_instr(aTHX_ a,b,c,d)
 #define find_script(a,b,c,d)   Perl_find_script(aTHX_ a,b,c,d)
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define find_threadsv(a)       Perl_find_threadsv(aTHX_ a)
 #endif
 #define force_list(a)          Perl_force_list(aTHX_ a)
@@ -1878,7 +1895,7 @@
 #define magic_getuvar(a,b)     Perl_magic_getuvar(aTHX_ a,b)
 #define magic_getvec(a,b)      Perl_magic_getvec(aTHX_ a,b)
 #define magic_len(a,b)         Perl_magic_len(aTHX_ a,b)
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define magic_mutexfree(a,b)   Perl_magic_mutexfree(aTHX_ a,b)
 #endif
 #define magic_nextpack(a,b,c)  Perl_magic_nextpack(aTHX_ a,b,c)
@@ -1941,6 +1958,9 @@
 #define my_exit(a)             Perl_my_exit(aTHX_ a)
 #define my_failure_exit()      Perl_my_failure_exit(aTHX)
 #define my_fflush_all()                Perl_my_fflush_all(aTHX)
+#define my_fork                        Perl_my_fork
+#define atfork_lock            Perl_atfork_lock
+#define atfork_unlock          Perl_atfork_unlock
 #define my_lstat()             Perl_my_lstat(aTHX)
 #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
 #define my_memcmp              Perl_my_memcmp
@@ -2031,7 +2051,7 @@
 #define peep(a)                        Perl_peep(aTHX_ a)
 #if defined(PERL_OBJECT)
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define new_struct_thread(a)   Perl_new_struct_thread(aTHX_ a)
 #endif
 #define call_atexit(a,b)       Perl_call_atexit(aTHX_ a,b)
@@ -2241,7 +2261,7 @@
 #if defined(UNLINK_ALL_VERSIONS)
 #define unlnk(a)               Perl_unlnk(aTHX_ a)
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define unlock_condpair(a)     Perl_unlock_condpair(aTHX_ a)
 #endif
 #define unsharepvn(a,b,c)      Perl_unsharepvn(aTHX_ a,b,c)
@@ -2296,7 +2316,7 @@
 #endif
 #define runops_standard()      Perl_runops_standard(aTHX)
 #define runops_debug()         Perl_runops_debug(aTHX)
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define sv_lock(a)             Perl_sv_lock(aTHX_ a)
 #endif
 #define sv_vcatpvf_mg(a,b,c)   Perl_sv_vcatpvf_mg(aTHX_ a,b,c)
@@ -2352,7 +2372,7 @@
 #define ss_dup(a,b)            Perl_ss_dup(aTHX_ a,b)
 #define any_dup(a,b)           Perl_any_dup(aTHX_ a,b)
 #define he_dup(a,b,c)          Perl_he_dup(aTHX_ a,b,c)
-#define re_dup(a)              Perl_re_dup(aTHX_ a)
+#define re_dup(a,b)            Perl_re_dup(aTHX_ a,b)
 #define fp_dup(a,b)            Perl_fp_dup(aTHX_ a,b)
 #define dirp_dup(a)            Perl_dirp_dup(aTHX_ a)
 #define gp_dup(a,b)            Perl_gp_dup(aTHX_ a,b)
@@ -2372,6 +2392,10 @@
 #define sys_intern_clear()     Perl_sys_intern_clear(aTHX)
 #define sys_intern_init()      Perl_sys_intern_init(aTHX)
 #endif
+#if defined(PERL_CUSTOM_OPS)
+#define custom_op_name(a)      Perl_custom_op_name(aTHX_ a)
+#define custom_op_desc(a)      Perl_custom_op_desc(aTHX_ a)
+#endif
 #if defined(PERL_OBJECT)
 #else
 #endif
@@ -2463,7 +2487,7 @@
 #define vcall_body(a)          S_vcall_body(aTHX_ a)
 #define vcall_list_body(a)     S_vcall_list_body(aTHX_ a)
 #endif
-#  if defined(USE_THREADS)
+#  if defined(USE_5005THREADS)
 #define init_main_thread()     S_init_main_thread(aTHX)
 #  endif
 #endif
@@ -2564,6 +2588,16 @@
 #if defined(PERL_IN_SCOPE_C) || defined(PERL_DECL_PROT)
 #define save_scalar_at(a)      S_save_scalar_at(aTHX_ a)
 #endif
+#if defined(USE_ITHREADS) && (defined(PERL_IN_SHAREDSV_C) || defined(PERL_DECL_PROT))
+#define sharedsv_init()                Perl_sharedsv_init(aTHX)
+#define sharedsv_new()         Perl_sharedsv_new(aTHX)
+#define sharedsv_find(a)       Perl_sharedsv_find(aTHX_ a)
+#define sharedsv_lock(a)       Perl_sharedsv_lock(aTHX_ a)
+#define sharedsv_unlock(a)     Perl_sharedsv_unlock(aTHX_ a)
+#define sharedsv_unlock_scope(a)       Perl_sharedsv_unlock_scope(aTHX_ a)
+#define sharedsv_thrcnt_inc(a) Perl_sharedsv_thrcnt_inc(aTHX_ a)
+#define sharedsv_thrcnt_dec(a) Perl_sharedsv_thrcnt_dec(aTHX_ a)
+#endif
 #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
 #define asIV(a)                        S_asIV(aTHX_ a)
 #define asUV(a)                        S_asUV(aTHX_ a)
@@ -2678,6 +2712,7 @@
 #define stdize_locale(a)       S_stdize_locale(aTHX_ a)
 #endif
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#define closest_cop(a,b)       S_closest_cop(aTHX_ a,b)
 #define mess_alloc()           S_mess_alloc(aTHX)
 #  if defined(LEAKTEST)
 #define xstat(a)               S_xstat(aTHX_ a)
@@ -2714,7 +2749,6 @@
 #define ck_match(a)            Perl_ck_match(aTHX_ a)
 #define ck_method(a)           Perl_ck_method(aTHX_ a)
 #define ck_null(a)             Perl_ck_null(aTHX_ a)
-#define ck_octmode(a)          Perl_ck_octmode(aTHX_ a)
 #define ck_open(a)             Perl_ck_open(aTHX_ a)
 #define ck_repeat(a)           Perl_ck_repeat(aTHX_ a)
 #define ck_require(a)          Perl_ck_require(aTHX_ a)
@@ -3192,7 +3226,7 @@
 #define Perl_my_chsize         CPerlObj::Perl_my_chsize
 #define my_chsize              Perl_my_chsize
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define Perl_condpair_magic    CPerlObj::Perl_condpair_magic
 #define condpair_magic         Perl_condpair_magic
 #endif
@@ -3386,7 +3420,7 @@
 #define fbm_instr              Perl_fbm_instr
 #define Perl_find_script       CPerlObj::Perl_find_script
 #define find_script            Perl_find_script
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define Perl_find_threadsv     CPerlObj::Perl_find_threadsv
 #define find_threadsv          Perl_find_threadsv
 #endif
@@ -3688,7 +3722,7 @@
 #define magic_getvec           Perl_magic_getvec
 #define Perl_magic_len         CPerlObj::Perl_magic_len
 #define magic_len              Perl_magic_len
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define Perl_magic_mutexfree   CPerlObj::Perl_magic_mutexfree
 #define magic_mutexfree                Perl_magic_mutexfree
 #endif
@@ -3806,6 +3840,12 @@
 #define my_failure_exit                Perl_my_failure_exit
 #define Perl_my_fflush_all     CPerlObj::Perl_my_fflush_all
 #define my_fflush_all          Perl_my_fflush_all
+#define Perl_my_fork           CPerlObj::Perl_my_fork
+#define my_fork                        Perl_my_fork
+#define Perl_atfork_lock       CPerlObj::Perl_atfork_lock
+#define atfork_lock            Perl_atfork_lock
+#define Perl_atfork_unlock     CPerlObj::Perl_atfork_unlock
+#define atfork_unlock          Perl_atfork_unlock
 #define Perl_my_lstat          CPerlObj::Perl_my_lstat
 #define my_lstat               Perl_my_lstat
 #if !defined(HAS_MEMCMP) || !defined(HAS_SANE_MEMCMP)
@@ -3985,7 +4025,7 @@
 #define Perl_run               CPerlObj::Perl_run
 #define Perl_parse             CPerlObj::Perl_parse
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define Perl_new_struct_thread CPerlObj::Perl_new_struct_thread
 #define new_struct_thread      Perl_new_struct_thread
 #endif
@@ -4409,7 +4449,7 @@
 #define Perl_unlnk             CPerlObj::Perl_unlnk
 #define unlnk                  Perl_unlnk
 #endif
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define Perl_unlock_condpair   CPerlObj::Perl_unlock_condpair
 #define unlock_condpair                Perl_unlock_condpair
 #endif
@@ -4513,7 +4553,7 @@
 #define runops_standard                Perl_runops_standard
 #define Perl_runops_debug      CPerlObj::Perl_runops_debug
 #define runops_debug           Perl_runops_debug
-#if defined(USE_THREADS)
+#if defined(USE_5005THREADS)
 #define Perl_sv_lock           CPerlObj::Perl_sv_lock
 #define sv_lock                        Perl_sv_lock
 #endif
@@ -4665,6 +4705,12 @@
 #define Perl_sys_intern_init   CPerlObj::Perl_sys_intern_init
 #define sys_intern_init                Perl_sys_intern_init
 #endif
+#if defined(PERL_CUSTOM_OPS)
+#define Perl_custom_op_name    CPerlObj::Perl_custom_op_name
+#define custom_op_name         Perl_custom_op_name
+#define Perl_custom_op_desc    CPerlObj::Perl_custom_op_desc
+#define custom_op_desc         Perl_custom_op_desc
+#endif
 #if defined(PERL_OBJECT)
 #else
 #endif
@@ -4823,7 +4869,7 @@
 #define S_vcall_list_body      CPerlObj::S_vcall_list_body
 #define vcall_list_body                S_vcall_list_body
 #endif
-#  if defined(USE_THREADS)
+#  if defined(USE_5005THREADS)
 #define S_init_main_thread     CPerlObj::S_init_main_thread
 #define init_main_thread       S_init_main_thread
 #  endif
@@ -4998,6 +5044,24 @@
 #define S_save_scalar_at       CPerlObj::S_save_scalar_at
 #define save_scalar_at         S_save_scalar_at
 #endif
+#if defined(USE_ITHREADS) && (defined(PERL_IN_SHAREDSV_C) || defined(PERL_DECL_PROT))
+#define Perl_sharedsv_init     CPerlObj::Perl_sharedsv_init
+#define sharedsv_init          Perl_sharedsv_init
+#define Perl_sharedsv_new      CPerlObj::Perl_sharedsv_new
+#define sharedsv_new           Perl_sharedsv_new
+#define Perl_sharedsv_find     CPerlObj::Perl_sharedsv_find
+#define sharedsv_find          Perl_sharedsv_find
+#define Perl_sharedsv_lock     CPerlObj::Perl_sharedsv_lock
+#define sharedsv_lock          Perl_sharedsv_lock
+#define Perl_sharedsv_unlock   CPerlObj::Perl_sharedsv_unlock
+#define sharedsv_unlock                Perl_sharedsv_unlock
+#define Perl_sharedsv_unlock_scope     CPerlObj::Perl_sharedsv_unlock_scope
+#define sharedsv_unlock_scope  Perl_sharedsv_unlock_scope
+#define Perl_sharedsv_thrcnt_inc       CPerlObj::Perl_sharedsv_thrcnt_inc
+#define sharedsv_thrcnt_inc    Perl_sharedsv_thrcnt_inc
+#define Perl_sharedsv_thrcnt_dec       CPerlObj::Perl_sharedsv_thrcnt_dec
+#define sharedsv_thrcnt_dec    Perl_sharedsv_thrcnt_dec
+#endif
 #if defined(PERL_IN_SV_C) || defined(PERL_DECL_PROT)
 #define S_asIV                 CPerlObj::S_asIV
 #define asIV                   S_asIV
@@ -5203,6 +5267,8 @@
 #define stdize_locale          S_stdize_locale
 #endif
 #if defined(PERL_IN_UTIL_C) || defined(PERL_DECL_PROT)
+#define S_closest_cop          CPerlObj::S_closest_cop
+#define closest_cop            S_closest_cop
 #define S_mess_alloc           CPerlObj::S_mess_alloc
 #define mess_alloc             S_mess_alloc
 #  if defined(LEAKTEST)
@@ -5270,8 +5336,6 @@
 #define ck_method              Perl_ck_method
 #define Perl_ck_null           CPerlObj::Perl_ck_null
 #define ck_null                        Perl_ck_null
-#define Perl_ck_octmode                CPerlObj::Perl_ck_octmode
-#define ck_octmode             Perl_ck_octmode
 #define Perl_ck_open           CPerlObj::Perl_ck_open
 #define ck_open                        Perl_ck_open
 #define Perl_ck_repeat         CPerlObj::Perl_ck_repeat