Merge 7ea3dd8 into 3bd97ba

MANIFEST

@@ -6297,7 +6297,6 @@ win32/vdir.h			Perl "host" virtual directory manager for Win32
 win32/vmem.h			Perl "host" memory manager for Win32
 win32/win32.c			Win32 port
 win32/win32.h			Win32 port
-win32/win32io.c			Win32 PerlIO layer support
 win32/win32iop.h		Win32 port
 win32/win32sck.c		Win32 port
 win32/win32thread.c		Win32 functions for threads

lib/PerlIO.pm

@@ -1,6 +1,6 @@
 package PerlIO;
 
-our $VERSION = '1.11';
+our $VERSION = '1.12';
 
 # Map layer name to package that defines it
 our %alias;
@@ -235,12 +235,6 @@ like C<:utf8>.  An example of a possible use might be:
 
 A more elegant (and safer) interface is needed.
 
-=item :win32
-
-On Win32 platforms this I<experimental> layer uses the native "handle" IO
-rather than the unix-like numeric file descriptor layer. Known to be
-buggy as of Perl 5.8.2.
-
 =back
 
 =head2 Custom Layers

perlio.c

@@ -1064,12 +1064,6 @@ PerlIO_default_layers(pTHX)
         PERLIO_FUNCS_DECL(*osLayer) = &PerlIO_unix;
         PL_def_layerlist = PerlIO_list_alloc(aTHX);
         PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_unix));
-#if defined(WIN32)
-        PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_win32));
-#  if 0
-        osLayer = &PerlIO_win32;
-#  endif
-#endif
         PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_raw));
         PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_perlio));
         PerlIO_define_layer(aTHX_ PERLIO_FUNCS_CAST(&PerlIO_stdio));

perliol.h

@@ -114,9 +114,6 @@ EXTCONST PerlIO_funcs PerlIO_utf8;
 EXTCONST PerlIO_funcs PerlIO_byte;
 EXTCONST PerlIO_funcs PerlIO_raw;
 EXTCONST PerlIO_funcs PerlIO_pending;
-#ifdef WIN32
-EXTCONST PerlIO_funcs PerlIO_win32;
-#endif
 PERL_CALLCONV PerlIO *PerlIO_allocate(pTHX);
 PERL_CALLCONV SV *PerlIO_arg_fetch(PerlIO_list_t *av, IV n);
 #define PerlIOArg PerlIO_arg_fetch(layers,n)

pod/perldiag.pod

@@ -4942,14 +4942,6 @@ and there is a bug in Perl in which the built-in regular expression
 folding rules are not accurate.  This may lead to incorrect results.
 Please report this as a bug to L<https://github.com/Perl/perl5/issues>.
 
-=item PerlIO layer ':win32' is experimental
-
-(S experimental::win32_perlio) The C<:win32> PerlIO layer is
-experimental.  If you want to take the risk of using this layer,
-simply disable this warning:
-
-    no warnings "experimental::win32_perlio";
-
 =item Perl_my_%s() not available
 
 (F) Your platform has very uncommon byte-order and integer size,

pod/perlexperiment.pod

@@ -95,16 +95,6 @@ L<[perl #18755]|https://github.com/Perl/perl5/issues/18755>
 
 See L<re/'strict' mode>
 
-=item The <:win32> IO pseudolayer
-
-Using this feature triggers warnings in the category
-C<experimental::win32_perlio>.
-
-The ticket for this experiment is
-L<[perl #13198]|https://github.com/Perl/perl5/issues/13198>.
-
-See also L<perlrun/PERLIO>
-
 =item Declaring a reference to a variable
 
 Introduced in Perl 5.26.0

pod/perlrun.pod

@@ -1098,13 +1098,6 @@ X<:unix>
 
 Low-level layer that calls C<read>, C<write>, C<lseek>, etc.
 
-=item :win32
-X<:win32>
-
-On Win32 platforms this I<experimental> layer uses native "handle" IO
-rather than a Unix-like numeric file descriptor layer. Known to be
-buggy in this release (5.30).
-
 =back
 
 The default set of layers should give acceptable results on all platforms.
@@ -1120,9 +1113,7 @@ on the version and vendor of the C compiler. Using our own C<:crlf> layer as
 the buffer avoids those issues and makes things more uniform.
 
 This release (5.30) uses C<:unix> as the bottom layer on Win32, and so still
-uses the C compiler's numeric file descriptor routines. There is an
-experimental native C<:win32> layer, which is expected to be enhanced and
-may eventually become the default under Win32.
+uses the C compiler's numeric file descriptor routines.
 
 The PERLIO environment variable is completely ignored when Perl
 is run in taint mode.

regen/warnings.pl

@@ -16,7 +16,7 @@
 #
 # This script is normally invoked from regen.pl.
 
-$VERSION = '1.51';
+$VERSION = '1.52';
 
 BEGIN {
     require './regen/regen_lib.pl';
@@ -95,8 +95,6 @@ BEGIN
                                     [ 5.019, DEFAULT_ON ],
                                 'experimental::signatures' =>
                                     [ 5.019, DEFAULT_ON ],
-                                'experimental::win32_perlio' =>
-                                    [ 5.021, DEFAULT_ON ],
                                 'experimental::refaliasing' =>
                                     [ 5.021, DEFAULT_ON ],
                                 'experimental::re_strict' =>

t/lib/warnings/perlio

@@ -56,17 +56,3 @@ close F;
 END { 1 while unlink "bb" } # KEEP THIS WITH THE LAST TEST.
 EXPECT
 Unknown PerlIO layer "xyz" at - line 5.
-########
-# NAME :win32 experimental warning
-# SKIP ?$^O ne "MSWin32" && ":win32 only available on Win32"
-open my $fh, ">:win32", "temp.txt" or die $^E;
-END { unlink "temp.txt"; }
-EXPECT
-PerlIO layer ':win32' is experimental at - line 1.
-########
-# NAME :win32 experimental warning disabled
-# SKIP ?$^O ne "MSWin32" && ":win32 only available on Win32"
-no warnings "experimental::win32_perlio";
-open my $fh, ">:win32", "temp.txt" or die $^E;
-END { unlink "temp.txt"; }
-EXPECT

warnings.h

@@ -106,34 +106,33 @@
 #define WARN_EXPERIMENTAL__CONST_ATTR	 59
 #define WARN_EXPERIMENTAL__RE_STRICT	 60
 #define WARN_EXPERIMENTAL__REFALIASING	 61
-#define WARN_EXPERIMENTAL__WIN32_PERLIO	 62
-#define WARN_LOCALE			 63
-#define WARN_MISSING			 64
-#define WARN_REDUNDANT			 65
+#define WARN_LOCALE			 62
+#define WARN_MISSING			 63
+#define WARN_REDUNDANT			 64
 
 /* Warnings Categories added in Perl 5.025 */
 
-#define WARN_EXPERIMENTAL__DECLARED_REFS 66
+#define WARN_EXPERIMENTAL__DECLARED_REFS 65
 
 /* Warnings Categories added in Perl 5.027 */
 
-#define WARN_EXPERIMENTAL__ALPHA_ASSERTIONS 67
-#define WARN_EXPERIMENTAL__SCRIPT_RUN	 68
-#define WARN_SHADOW			 69
+#define WARN_EXPERIMENTAL__ALPHA_ASSERTIONS 66
+#define WARN_EXPERIMENTAL__SCRIPT_RUN	 67
+#define WARN_SHADOW			 68
 
 /* Warnings Categories added in Perl 5.029 */
 
-#define WARN_EXPERIMENTAL__PRIVATE_USE	 70
-#define WARN_EXPERIMENTAL__UNIPROP_WILDCARDS 71
-#define WARN_EXPERIMENTAL__VLB		 72
+#define WARN_EXPERIMENTAL__PRIVATE_USE	 69
+#define WARN_EXPERIMENTAL__UNIPROP_WILDCARDS 70
+#define WARN_EXPERIMENTAL__VLB		 71
 
 /* Warnings Categories added in Perl 5.031 */
 
-#define WARN_EXPERIMENTAL__ISA		 73
+#define WARN_EXPERIMENTAL__ISA		 72
 
 /* Warnings Categories added in Perl 5.033 */
 
-#define WARN_EXPERIMENTAL__TRY		 74
+#define WARN_EXPERIMENTAL__TRY		 73
 #define WARNsize			 19
 #define WARN_ALLstring			 "\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125\125"
 #define WARN_NONEstring			 "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
@@ -305,7 +304,6 @@ category parameters passed.
 =for apidoc Amnh||WARN_EXPERIMENTAL__CONST_ATTR
 =for apidoc Amnh||WARN_EXPERIMENTAL__RE_STRICT
 =for apidoc Amnh||WARN_EXPERIMENTAL__REFALIASING
-=for apidoc Amnh||WARN_EXPERIMENTAL__WIN32_PERLIO
 =for apidoc Amnh||WARN_LOCALE
 =for apidoc Amnh||WARN_MISSING
 =for apidoc Amnh||WARN_REDUNDANT

win32/GNUmakefile

@@ -1108,12 +1108,6 @@ WIN32_SRC	=		\
 		.\win32thread.c	\
 		.\fcrypt.c
 
-# We need this for miniperl build unless we override canned
-# config.h #define building mini\*
-#ifeq ($(USE_PERLIO)" == "define"
-WIN32_SRC	+= .\win32io.c
-#endif
-
 CORE_NOCFG_H	=		\
 		..\av.h		\
 		..\cop.h	\

win32/Makefile

@@ -794,7 +794,6 @@ EXTRACORE_SRC	= $(EXTRACORE_SRC) ..\perlio.c
 
 WIN32_SRC	=		\
 		.\win32.c	\
-		.\win32io.c	\
 		.\win32sck.c	\
 		.\win32thread.c	\
 		.\fcrypt.c