From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Thu, 21 Jun 2001 14:16:18 +0000 (+0000)
Subject: Integrate mainline
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1244b64003dd8dbc75cb8ee237b478b3077523f0;p=p5sagit%2Fp5-mst-13.2.git

Integrate mainline

p4raw-id: //depot/perlio@10787
---

1244b64003dd8dbc75cb8ee237b478b3077523f0
diff --cc pod/perlapi.pod
index 91d6b31,e62012e..bac156f
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@@ -329,7 -329,7 +329,7 @@@ L<perlsub/"Constant Functions">
  	SV*	cv_const_sv(CV* cv)
  
  =for hackers
--Found in file op.c
++Found in file opmini.c
  
  =item dAX
  
@@@ -1153,7 -1153,7 +1153,7 @@@ method, similar to C<use Foo::Bar VERSI
  	void	load_module(U32 flags, SV* name, SV* ver, ...)
  
  =for hackers
--Found in file op.c
++Found in file opmini.c
  
  =item looks_like_number
  
@@@ -1292,7 -1292,7 +1292,7 @@@ eligible for inlining at compile-time
  	CV*	newCONSTSUB(HV* stash, char* name, SV* sv)
  
  =for hackers
--Found in file op.c
++Found in file opmini.c
  
  =item newHV
  
@@@ -1452,7 -1452,7 +1452,7 @@@ Found in file sv.
  Used by C<xsubpp> to hook up XSUBs as Perl subs.
  
  =for hackers
--Found in file op.c
++Found in file opmini.c
  
  =item newXSproto
  
@@@ -2422,21 -2422,21 +2422,21 @@@ Like C<SvPV_nolen>, but converts sv to 
  =for hackers
  Found in file sv.h
  
--=item SvPVx
++=item SvPVX
  
--A version of C<SvPV> which guarantees to evaluate sv only once.
++Returns a pointer to the physical string in the SV.  The SV must contain a
++string.
  
--	char*	SvPVx(SV* sv, STRLEN len)
++	char*	SvPVX(SV* sv)
  
  =for hackers
  Found in file sv.h
  
--=item SvPVX
++=item SvPVx
  
--Returns a pointer to the physical string in the SV.  The SV must contain a
--string.
++A version of C<SvPV> which guarantees to evaluate sv only once.
  
--	char*	SvPVX(SV* sv)
++	char*	SvPVx(SV* sv, STRLEN len)
  
  =for hackers
  Found in file sv.h
@@@ -2766,22 -2766,22 +2766,22 @@@ for a version which guarantees to evalu
  =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 efficent 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 efficent C<SvUV> otherwise.
  
--	UV	SvUVX(SV* sv)
++	UV	SvUVx(SV* sv)
  
  =for hackers
  Found in file sv.h