From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Fri, 3 Aug 2001 08:17:38 +0000 (+0000)
Subject: Integrate mainline
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e5937be4fc68b98f3a19283789f243fd48c54ead;p=p5sagit%2Fp5-mst-13.2.git

Integrate mainline

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

e5937be4fc68b98f3a19283789f243fd48c54ead
diff --cc pod/perlapi.pod
index bee65f6,e41cf8a..f62c626
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@@ -1344,6 -1344,6 +1344,17 @@@ SV is B<not> incremented
  =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
@@@ -1357,17 -1357,17 +1368,6 @@@ C<id> is an integer id between 0 and 12
  =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
@@@ -2119,22 -2119,22 +2119,22 @@@ version which guarantees to evaluate s
  =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