Change 13069 by jhi@alpha on 2001/11/18 14:05:23
Integrate perlio; force the inclusion of the PL_runops_*
Affected files ...
.... //depot/perl/embedvar.h#130 integrate
.... //depot/perl/hv.c#92 integrate
.... //depot/perl/perlapi.h#52 integrate
.... //depot/perl/perlvars.h#38 integrate
.... //depot/perl/pod/perlapi.pod#109 integrate
Differences ...
==== //depot/perl/embedvar.h#130 (text+w) ====
Index: perl/embedvar.h
--- perl/embedvar.h.~1~ Sun Nov 18 07:15:05 2001
+++ perl/embedvar.h Sun Nov 18 07:15:05 2001
@@ -1338,6 +1338,8 @@
#define PL_malloc_mutex (PL_Vars.Gmalloc_mutex)
#define PL_op_mutex (PL_Vars.Gop_mutex)
#define PL_patleave (PL_Vars.Gpatleave)
+#define PL_runops_dbg (PL_Vars.Grunops_dbg)
+#define PL_runops_std (PL_Vars.Grunops_std)
#define PL_sharedsv_space (PL_Vars.Gsharedsv_space)
#define PL_sharedsv_space_mutex (PL_Vars.Gsharedsv_space_mutex)
#define PL_thr_key (PL_Vars.Gthr_key)
@@ -1352,6 +1354,8 @@
#define PL_Gmalloc_mutex PL_malloc_mutex
#define PL_Gop_mutex PL_op_mutex
#define PL_Gpatleave PL_patleave
+#define PL_Grunops_dbg PL_runops_dbg
+#define PL_Grunops_std PL_runops_std
#define PL_Gsharedsv_space PL_sharedsv_space
#define PL_Gsharedsv_space_mutex PL_sharedsv_space_mutex
#define PL_Gthr_key PL_thr_key
==== //depot/perl/hv.c#92 (text) ====
==== //depot/perl/perlapi.h#52 (text+w) ====
Index: perl/perlapi.h
--- perl/perlapi.h.~1~ Sun Nov 18 07:15:05 2001
+++ perl/perlapi.h Sun Nov 18 07:15:05 2001
@@ -937,6 +937,10 @@
#define PL_op_mutex (*Perl_Gop_mutex_ptr(NULL))
#undef PL_patleave
#define PL_patleave (*Perl_Gpatleave_ptr(NULL))
+#undef PL_runops_dbg
+#define PL_runops_dbg (*Perl_Grunops_dbg_ptr(NULL))
+#undef PL_runops_std
+#define PL_runops_std (*Perl_Grunops_std_ptr(NULL))
#undef PL_sharedsv_space
#define PL_sharedsv_space (*Perl_Gsharedsv_space_ptr(NULL))
#undef PL_sharedsv_space_mutex
==== //depot/perl/perlvars.h#38 (text) ====
Index: perl/perlvars.h
--- perl/perlvars.h.~1~ Sun Nov 18 07:15:05 2001
+++ perl/perlvars.h Sun Nov 18 07:15:05 2001
@@ -40,3 +40,8 @@
PERLVAR(Gsharedsv_space, PerlInterpreter*) /* The shared sv space */
PERLVAR(Gsharedsv_space_mutex, perl_mutex) /* Mutex protecting the shared sv space */
#endif
+
+/* Force inclusion of both runops options */
+PERLVARI(Grunops_std, runops_proc_t, MEMBER_TO_FPTR(Perl_runops_standard))
+PERLVARI(Grunops_dbg, runops_proc_t, MEMBER_TO_FPTR(Perl_runops_debug))
+
==== //depot/perl/pod/perlapi.pod#109 (text+w) ====
Index: perl/pod/perlapi.pod
--- perl/pod/perlapi.pod.~1~ Sun Nov 18 07:15:05 2001
+++ perl/pod/perlapi.pod Sun Nov 18 07:15:05 2001
@@ -1404,6 +1404,17 @@
=for hackers
Found in file sv.c
+=item newSV
+
+Create a new null SV, or if len > 0, create a new empty SVt_PV type SV
+with an initial PV allocation of len+1. Normally accessed via the C<NEWSV>
+macro.
+
+ SV* newSV(STRLEN len)
+
+=for hackers
+Found in file sv.c
+
=item NEWSV
Creates a new SV. A non-zero C<len> parameter indicates the number of
@@ -1417,17 +1428,6 @@
=for hackers
Found in file handy.h
-=item newSV
-
-Create a new null SV, or if len > 0, create a new empty SVt_PV type SV
-with an initial PV allocation of len+1. Normally accessed via the C<NEWSV>
-macro.
-
- SV* newSV(STRLEN len)
-
-=for hackers
-Found in file sv.c
-
=item newSViv
Creates a new SV and copies an integer into it. The reference count for the
@@ -2967,22 +2967,22 @@
=for hackers
Found in file sv.h
-=item SvUVx
+=item SvUVX
-Coerces the given SV to an unsigned integer and returns it. Guarantees to
-evaluate sv only once. Use the more efficient C<SvUV> otherwise.
+Returns the raw value in the SV's UV slot, without checks or conversions.
+Only use when you are sure SvIOK is true. See also C<SvUV()>.
- UV SvUVx(SV* sv)
+ UV SvUVX(SV* sv)
=for hackers
Found in file sv.h
-=item SvUVX
+=item SvUVx
-Returns the raw value in the SV's UV slot, without checks or conversions.
-Only use when you are sure SvIOK is true. See also C<SvUV()>.
+Coerces the given SV to an unsigned integer and returns it. Guarantees to
+evaluate sv only once. Use the more efficient C<SvUV> otherwise.
- UV SvUVX(SV* sv)
+ UV SvUVx(SV* sv)
=for hackers
Found in file sv.h
End of Patch.
