From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Mon, 30 Oct 2000 19:37:23 +0000 (+0000)
Subject: Change files which are mysteriously different to mainline to be
X-Git-Tag: accepted/trunk/20130322.191538~23899^2~980
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9e021e644582e6ca1e9f6b4c1f1a8a7c7e2a58d;p=platform%2Fupstream%2Fperl.git

Change files which are mysteriously different to mainline to be
copies of mainline.

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

diff --git a/objXSUB.h b/objXSUB.h
index 4d5ff6b..5827b72 100644
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -1901,7 +1901,7 @@
 #define Perl_whichsig		pPerl->Perl_whichsig
 #undef  whichsig
 #define whichsig		Perl_whichsig
-#if defined(USE_PURE_BISON)
+#ifdef USE_PURE_BISON
 #else
 #endif
 #if defined(MYMALLOC)
diff --git a/perlapi.c b/perlapi.c
index efa7164..d71ac49 100644
--- a/perlapi.c
+++ b/perlapi.c
@@ -3439,7 +3439,7 @@ Perl_whichsig(pTHXo_ char* sig)
 {
     return ((CPerlObj*)pPerl)->Perl_whichsig(sig);
 }
-#if defined(USE_PURE_BISON)
+#ifdef USE_PURE_BISON
 #else
 #endif
 #if defined(MYMALLOC)
diff --git a/pod/perlapi.pod b/pod/perlapi.pod
index 634180f..061f403 100644
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@ -3223,10 +3223,10 @@ C<retlen> will be set to the length, in bytes, of that character,
 and the pointer C<s> will be advanced to the end of the character.
 
 If C<s> does not point to a well-formed UTF8 character, the behaviour
-is dependent on the value of C<checking>: if this is true, it is
-assumed that the caller will raise a warning, and this function will
-set C<retlen> to C<-1> and return. If C<checking> is not true, an optional UTF8
-warning is produced.
+is dependent on the value of C<flags>: if it contains UTF8_CHECK_ONLY,
+it is assumed that the caller will raise a warning, and this function
+will set C<retlen> to C<-1> and return.  The C<flags> can also contain
+various flags to allow deviations from the strict UTF-8 encoding.
 
 	U8* s	utf8_to_uv(STRLEN curlen, I32 *retlen, U32 flags)