Regen headers.

p4raw-id: //depot/perl@10758

diff --git a/embed.h b/embed.h
index 7424976..42013a1 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -2345,17 +2345,17 @@
 #define my_attrs(a,b)          Perl_my_attrs(aTHX_ a,b)
 #define boot_core_xsutils()    Perl_boot_core_xsutils(aTHX)
 #if defined(USE_ITHREADS)
-#define cx_dup(a,b,c)          Perl_cx_dup(aTHX_ a,b,c)
-#define si_dup(a)              Perl_si_dup(aTHX_ a)
-#define ss_dup(a)              Perl_ss_dup(aTHX_ a)
+#define cx_dup(a,b,c,d)                Perl_cx_dup(aTHX_ a,b,c,d)
+#define si_dup(a,b)            Perl_si_dup(aTHX_ a,b)
+#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)            Perl_he_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 fp_dup(a,b)            Perl_fp_dup(aTHX_ a,b)
 #define dirp_dup(a)            Perl_dirp_dup(aTHX_ a)
-#define gp_dup(a)              Perl_gp_dup(aTHX_ a)
-#define mg_dup(a)              Perl_mg_dup(aTHX_ a)
-#define sv_dup(a)              Perl_sv_dup(aTHX_ a)
+#define gp_dup(a,b)            Perl_gp_dup(aTHX_ a,b)
+#define mg_dup(a,b)            Perl_mg_dup(aTHX_ a,b)
+#define sv_dup(a,b)            Perl_sv_dup(aTHX_ a,b)
 #if defined(HAVE_INTERP_INTERN)
 #define sys_intern_dup(a,b)    Perl_sys_intern_dup(aTHX_ a,b)
 #endif

diff --git a/embedvar.h b/embedvar.h
index 42b51e0..a77a273 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -200,7 +200,6 @@
 #define PL_bufend              (PERL_GET_INTERP->Ibufend)
 #define PL_bufptr              (PERL_GET_INTERP->Ibufptr)
 #define PL_checkav             (PERL_GET_INTERP->Icheckav)
-#define PL_clone_callbacks     (PERL_GET_INTERP->Iclone_callbacks)
 #define PL_collation_ix                (PERL_GET_INTERP->Icollation_ix)
 #define PL_collation_name      (PERL_GET_INTERP->Icollation_name)
 #define PL_collation_standard  (PERL_GET_INTERP->Icollation_standard)
@@ -483,7 +482,6 @@
 #define PL_bufend              (vTHX->Ibufend)
 #define PL_bufptr              (vTHX->Ibufptr)
 #define PL_checkav             (vTHX->Icheckav)
-#define PL_clone_callbacks     (vTHX->Iclone_callbacks)
 #define PL_collation_ix                (vTHX->Icollation_ix)
 #define PL_collation_name      (vTHX->Icollation_name)
 #define PL_collation_standard  (vTHX->Icollation_standard)
@@ -902,7 +900,6 @@
 #define PL_bufend              (aTHXo->interp.Ibufend)
 #define PL_bufptr              (aTHXo->interp.Ibufptr)
 #define PL_checkav             (aTHXo->interp.Icheckav)
-#define PL_clone_callbacks     (aTHXo->interp.Iclone_callbacks)
 #define PL_collation_ix                (aTHXo->interp.Icollation_ix)
 #define PL_collation_name      (aTHXo->interp.Icollation_name)
 #define PL_collation_standard  (aTHXo->interp.Icollation_standard)
@@ -1186,7 +1183,6 @@
 #define PL_Ibufend             PL_bufend
 #define PL_Ibufptr             PL_bufptr
 #define PL_Icheckav            PL_checkav
-#define PL_Iclone_callbacks    PL_clone_callbacks
 #define PL_Icollation_ix       PL_collation_ix
 #define PL_Icollation_name     PL_collation_name
 #define PL_Icollation_standard PL_collation_standard

diff --git a/global.sym b/global.sym
index ef481fa..50b6bd1 100644 (file)
--- a/global.sym
+++ b/global.sym
@@ -437,7 +437,6 @@ Perl_sv_pos_b2u
 Perl_sv_pvn_force
 Perl_sv_pvutf8n_force
 Perl_sv_pvbyten_force
-Perl_sv_realpath
 Perl_sv_reftype
 Perl_sv_replace
 Perl_sv_report_used

diff --git a/perlapi.c b/perlapi.c
index 73f0108..fc5ca24 100644 (file)
--- a/perlapi.c
+++ b/perlapi.c
@@ -4047,23 +4047,23 @@ Perl_newMYSUB(pTHXo_ I32 floor, OP *o, OP *proto, OP *attrs, OP *block)
 
 #undef  Perl_cx_dup
 PERL_CONTEXT*
-Perl_cx_dup(pTHXo_ PERL_CONTEXT* cx, I32 ix, I32 max)
+Perl_cx_dup(pTHXo_ PERL_CONTEXT* cx, I32 ix, I32 max, clone_params* param)
 {
-    return ((CPerlObj*)pPerl)->Perl_cx_dup(cx, ix, max);
+    return ((CPerlObj*)pPerl)->Perl_cx_dup(cx, ix, max, param);
 }
 
 #undef  Perl_si_dup
 PERL_SI*
-Perl_si_dup(pTHXo_ PERL_SI* si)
+Perl_si_dup(pTHXo_ PERL_SI* si, clone_params* param)
 {
-    return ((CPerlObj*)pPerl)->Perl_si_dup(si);
+    return ((CPerlObj*)pPerl)->Perl_si_dup(si, param);
 }
 
 #undef  Perl_ss_dup
 ANY*
-Perl_ss_dup(pTHXo_ PerlInterpreter* proto_perl)
+Perl_ss_dup(pTHXo_ PerlInterpreter* proto_perl, clone_params* param)
 {
-    return ((CPerlObj*)pPerl)->Perl_ss_dup(proto_perl);
+    return ((CPerlObj*)pPerl)->Perl_ss_dup(proto_perl, param);
 }
 
 #undef  Perl_any_dup
@@ -4075,9 +4075,9 @@ Perl_any_dup(pTHXo_ void* v, PerlInterpreter* proto_perl)
 
 #undef  Perl_he_dup
 HE*
-Perl_he_dup(pTHXo_ HE* e, bool shared)
+Perl_he_dup(pTHXo_ HE* e, bool shared, clone_params* param)
 {
-    return ((CPerlObj*)pPerl)->Perl_he_dup(e, shared);
+    return ((CPerlObj*)pPerl)->Perl_he_dup(e, shared, param);
 }
 
 #undef  Perl_re_dup
@@ -4103,23 +4103,23 @@ Perl_dirp_dup(pTHXo_ DIR* dp)
 
 #undef  Perl_gp_dup
 GP*
-Perl_gp_dup(pTHXo_ GP* gp)
+Perl_gp_dup(pTHXo_ GP* gp, clone_params* param)
 {
-    return ((CPerlObj*)pPerl)->Perl_gp_dup(gp);
+    return ((CPerlObj*)pPerl)->Perl_gp_dup(gp, param);
 }
 
 #undef  Perl_mg_dup
 MAGIC*
-Perl_mg_dup(pTHXo_ MAGIC* mg)
+Perl_mg_dup(pTHXo_ MAGIC* mg, clone_params* param)
 {
-    return ((CPerlObj*)pPerl)->Perl_mg_dup(mg);
+    return ((CPerlObj*)pPerl)->Perl_mg_dup(mg, param);
 }
 
 #undef  Perl_sv_dup
 SV*
-Perl_sv_dup(pTHXo_ SV* sstr)
+Perl_sv_dup(pTHXo_ SV* sstr, clone_params* param)
 {
-    return ((CPerlObj*)pPerl)->Perl_sv_dup(sstr);
+    return ((CPerlObj*)pPerl)->Perl_sv_dup(sstr, param);
 }
 #if defined(HAVE_INTERP_INTERN)
 

diff --git a/perlapi.h b/perlapi.h
index 93f015c..7085e74 100644 (file)
--- a/perlapi.h
+++ b/perlapi.h
@@ -140,8 +140,6 @@ START_EXTERN_C
 #define PL_bufptr              (*Perl_Ibufptr_ptr(aTHXo))
 #undef  PL_checkav
 #define PL_checkav             (*Perl_Icheckav_ptr(aTHXo))
-#undef  PL_clone_callbacks
-#define PL_clone_callbacks     (*Perl_Iclone_callbacks_ptr(aTHXo))
 #undef  PL_collation_ix
 #define PL_collation_ix                (*Perl_Icollation_ix_ptr(aTHXo))
 #undef  PL_collation_name

diff --git a/pod/perlapi.pod b/pod/perlapi.pod
index 91d6b31..e62012e 100644 (file)
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@ -2098,22 +2098,22 @@ version which guarantees to evaluate sv only once.
 =for hackers
 Found in file sv.h
 
-=item SvIVx
+=item SvIVX
 
-Coerces the given SV to an integer and returns it. Guarantees to evaluate
-sv only once. Use the more efficent C<SvIV> otherwise.
+Returns the raw value in the SV's IV slot, without checks or conversions.
+Only use when you are sure SvIOK is true. See also C<SvIV()>.
 
-       IV      SvIVx(SV* sv)
+       IV      SvIVX(SV* sv)
 
 =for hackers
 Found in file sv.h
 
-=item SvIVX
+=item SvIVx
 
-Returns the raw value in the SV's IV slot, without checks or conversions.
-Only use when you are sure SvIOK is true. See also C<SvIV()>.
+Coerces the given SV to an integer and returns it. Guarantees to evaluate
+sv only once. Use the more efficent C<SvIV> otherwise.
 
-       IV      SvIVX(SV* sv)
+       IV      SvIVx(SV* sv)
 
 =for hackers
 Found in file sv.h
@@ -2213,22 +2213,22 @@ which guarantees to evaluate sv only once.
 =for hackers
 Found in file sv.h
 
-=item SvNVx
+=item SvNVX
 
-Coerces the given SV to a double and returns it. Guarantees to evaluate
-sv only once. Use the more efficent C<SvNV> otherwise.
+Returns the raw value in the SV's NV slot, without checks or conversions.
+Only use when you are sure SvNOK is true. See also C<SvNV()>.
 
-       NV      SvNVx(SV* sv)
+       NV      SvNVX(SV* sv)
 
 =for hackers
 Found in file sv.h
 
-=item SvNVX
+=item SvNVx
 
-Returns the raw value in the SV's NV slot, without checks or conversions.
-Only use when you are sure SvNOK is true. See also C<SvNV()>.
+Coerces the given SV to a double and returns it. Guarantees to evaluate
+sv only once. Use the more efficent C<SvNV> otherwise.
 
-       NV      SvNVX(SV* sv)
+       NV      SvNVx(SV* sv)
 
 =for hackers
 Found in file sv.h
@@ -2643,19 +2643,19 @@ false, defined or undefined.  Does not handle 'get' magic.
 =for hackers
 Found in file sv.h
 
-=item svtype
+=item SvTYPE
 
-An enum of flags for Perl types.  These are found in the file B<sv.h> 
-in the C<svtype> enum.  Test these flags with the C<SvTYPE> macro.
+Returns the type of the SV.  See C<svtype>.
+
+       svtype  SvTYPE(SV* sv)
 
 =for hackers
 Found in file sv.h
 
-=item SvTYPE
-
-Returns the type of the SV.  See C<svtype>.
+=item svtype
 
-       svtype  SvTYPE(SV* sv)
+An enum of flags for Perl types.  These are found in the file B<sv.h> 
+in the C<svtype> enum.  Test these flags with the C<SvTYPE> macro.
 
 =for hackers
 Found in file sv.h
@@ -3484,15 +3484,6 @@ instead.
 =for hackers
 Found in file sv.c
 
-=item sv_realpath
-
-Wrap or emulate realpath(3).
-
-       int     sv_realpath(SV* sv, char *path, STRLEN len)
-
-=for hackers
-Found in file util.c
-
 =item sv_reftype
 
 Returns a string describing what the SV is a reference to.

diff --git a/proto.h b/proto.h
index 05e2da8..0fe6095 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -956,17 +956,17 @@ PERL_CALLCONV void        Perl_newMYSUB(pTHX_ I32 floor, OP *o, OP *proto, OP *attrs, O
 PERL_CALLCONV OP *     Perl_my_attrs(pTHX_ OP *o, OP *attrs);
 PERL_CALLCONV void     Perl_boot_core_xsutils(pTHX);
 #if defined(USE_ITHREADS)
-PERL_CALLCONV PERL_CONTEXT*    Perl_cx_dup(pTHX_ PERL_CONTEXT* cx, I32 ix, I32 max);
-PERL_CALLCONV PERL_SI* Perl_si_dup(pTHX_ PERL_SI* si);
-PERL_CALLCONV ANY*     Perl_ss_dup(pTHX_ PerlInterpreter* proto_perl);
+PERL_CALLCONV PERL_CONTEXT*    Perl_cx_dup(pTHX_ PERL_CONTEXT* cx, I32 ix, I32 max, clone_params* param);
+PERL_CALLCONV PERL_SI* Perl_si_dup(pTHX_ PERL_SI* si, clone_params* param);
+PERL_CALLCONV ANY*     Perl_ss_dup(pTHX_ PerlInterpreter* proto_perl, clone_params* param);
 PERL_CALLCONV void*    Perl_any_dup(pTHX_ void* v, PerlInterpreter* proto_perl);
-PERL_CALLCONV HE*      Perl_he_dup(pTHX_ HE* e, bool shared);
+PERL_CALLCONV HE*      Perl_he_dup(pTHX_ HE* e, bool shared, clone_params* param);
 PERL_CALLCONV REGEXP*  Perl_re_dup(pTHX_ REGEXP* r);
 PERL_CALLCONV PerlIO*  Perl_fp_dup(pTHX_ PerlIO* fp, char type);
 PERL_CALLCONV DIR*     Perl_dirp_dup(pTHX_ DIR* dp);
-PERL_CALLCONV GP*      Perl_gp_dup(pTHX_ GP* gp);
-PERL_CALLCONV MAGIC*   Perl_mg_dup(pTHX_ MAGIC* mg);
-PERL_CALLCONV SV*      Perl_sv_dup(pTHX_ SV* sstr);
+PERL_CALLCONV GP*      Perl_gp_dup(pTHX_ GP* gp, clone_params* param);
+PERL_CALLCONV MAGIC*   Perl_mg_dup(pTHX_ MAGIC* mg, clone_params* param);
+PERL_CALLCONV SV*      Perl_sv_dup(pTHX_ SV* sstr, clone_params* param);
 #if defined(HAVE_INTERP_INTERN)
 PERL_CALLCONV void     Perl_sys_intern_dup(pTHX_ struct interp_intern* src, struct interp_intern* dst);
 #endif