This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
locale.c: Windows will never be EBCDIC
authorKarl Williamson <khw@cpan.org>
Sun, 7 Jan 2018 22:30:06 +0000 (15:30 -0700)
committerKarl Williamson <khw@cpan.org>
Wed, 31 Jan 2018 05:49:02 +0000 (22:49 -0700)
This adjusts the conditional compilation so that win32 is a subset of
non-EBCDIC.  This will be useful in the next commit.

locale.c

index b3e1b0e..8a3e461 100644 (file)
--- a/locale.c
+++ b/locale.c
@@ -3601,8 +3601,7 @@ Perl__is_cur_LC_category_utf8(pTHX_ int category)
                                 save_input_locale));
     }
 
-#  endif
-#  ifdef WIN32
+#      ifdef WIN32
 
     /* http://msdn.microsoft.com/en-us/library/windows/desktop/dd317756.aspx */
     if (memENDs(save_input_locale, final_pos, "65001")) {
@@ -3613,7 +3612,8 @@ Perl__is_cur_LC_category_utf8(pTHX_ int category)
         goto finish_and_return;
     }
 
-#  endif
+#      endif
+#    endif
 
     /* Other common encodings are the ISO 8859 series, which aren't UTF-8.  But
      * since we are about to return FALSE anyway, there is no point in doing