X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=locale.c;h=0986614794f2518d99b38d4675b25ee9133f23fa;hb=39f1703b298e7cfad95b26600223fa7595098e73;hp=1abda3ea6c9b7a9fc46692e5adf9bb5f4c946aad;hpb=085a54d9d9ac170c5d83f58a4044ae87b7a9d8a5;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/locale.c b/locale.c
index 1abda3e..0986614 100644
--- a/locale.c
+++ b/locale.c
@@ -473,14 +473,16 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
 
 #endif /* USE_LOCALE */
 
+#ifdef USE_PERLIO
     {
-      /* Set PL_wantut8 to TRUE if any of the following are true:
+      /* Set PL_wantutf8 to TRUE if using PerlIO _and_
+	 any of the following are true:
 	 - nl_langinfo(CODESET) contains /^utf-?8/i
 	 - $ENV{LANGUAGE} contains /^utf-?8/i (only if using glibc)
 	 - $ENV{LC_CALL} contains /^utf-?8/i
 	 - $ENV{LC_CTYPE} contains /^utf-?8/i
 	 - $ENV{LANG} contains /^utf-?8/i
-	 If PL_wantutf8 is true the perl.c:S_parse_body()
+	 If PL_wantutf8 is true, perl.c:S_parse_body()
 	 will turn on the PerlIO :utf8 discipline on STDIN, STDOUT,
 	 STDERR, _and_ the default open discipline.
       */
@@ -518,6 +520,7 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
 	 if (wantutf8)
 	      PL_wantutf8 = TRUE;
     }
+#endif
 
 #ifdef USE_LOCALE_CTYPE
     if (curctype != NULL)