diff --git a/dist/IO/IO.pm b/dist/IO/IO.pm index 8c094f802e21..b7e1646f84d8 100644 --- a/dist/IO/IO.pm +++ b/dist/IO/IO.pm @@ -7,7 +7,7 @@ use Carp; use strict; use warnings; -our $VERSION = "1.46"; +our $VERSION = "1.47"; XSLoader::load 'IO', $VERSION; sub import { diff --git a/dist/IO/IO.xs b/dist/IO/IO.xs index f0b161cd01d4..5d6491f9b644 100644 --- a/dist/IO/IO.xs +++ b/dist/IO/IO.xs @@ -49,10 +49,6 @@ typedef FILE * OutputStream; #define MY_start_subparse(fmt,flags) start_subparse(fmt,flags) -#ifndef gv_stashpvn -#define gv_stashpvn(str,len,flags) gv_stashpv(str,flags) -#endif - #ifndef __attribute__noreturn__ # define __attribute__noreturn__ #endif @@ -61,14 +57,6 @@ typedef FILE * OutputStream; # define NORETURN_FUNCTION_END /* NOT REACHED */ return 0 #endif -#ifndef dVAR -# define dVAR dNOOP -#endif - -#ifndef OpSIBLING -# define OpSIBLING(o) (o)->op_sibling -#endif - static int not_here(const char *s) __attribute__noreturn__; static int not_here(const char *s) @@ -77,36 +65,6 @@ not_here(const char *s) NORETURN_FUNCTION_END; } -#ifndef UVCHR_IS_INVARIANT /* For use with Perls without this macro */ -# if ('A' == 65) -# define UVCHR_IS_INVARIANT(cp) ((cp) < 128) -# elif (defined(NATIVE_IS_INVARIANT)) /* EBCDIC on old Perl */ -# define UVCHR_IS_INVARIANT(cp) ((cp) < 256 && NATIVE_IS_INVARIANT(cp)) -# elif defined(isASCII) /* EBCDIC on very old Perl */ - /* In EBCDIC, the invariants are the code points corresponding to ASCII, - * plus all the controls. All but one EBCDIC control is below SPACE; it - * varies depending on the code page, determined by the ord of '^' */ -# define UVCHR_IS_INVARIANT(cp) (isASCII(cp) \ - || (cp) < ' ' \ - || (('^' == 106) /* POSIX-BC */ \ - ? (cp) == 95 \ - : (cp) == 0xFF)) /* 1047 or 037 */ -# else /* EBCDIC on very very old Perl */ - /* This assumes isascii() is available, but that could be fixed by - * having the macro test for each printable ASCII char */ -# define UVCHR_IS_INVARIANT(cp) (isascii(cp) \ - || (cp) < ' ' \ - || (('^' == 106) /* POSIX-BC */ \ - ? (cp) == 95 \ - : (cp) == 0xFF)) /* 1047 or 037 */ -# endif -#endif - - -#ifndef PerlIO -#define PerlIO_fileno(f) fileno(f) -#endif - static int io_blocking(pTHX_ InputStream f, int block) {