Integrate mainline

p4raw-id: //depot/perlio@14136

diff --git a/perl.h b/perl.h
index 7a876b5..3dcb146 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -425,7 +425,7 @@ int usleep(unsigned int);
 #  define MYSWAP
 #endif
 
-/* Cannot include embed.h here on Win32 as win32.h has not 
+/* Cannot include embed.h here on Win32 as win32.h has not
    yet been included and defines some config variables e.g. HAVE_INTERP_INTERN
  */
 #if !defined(PERL_FOR_X2P) && !(defined(WIN32)||defined(VMS))

diff --git a/t/op/utf8decode.t b/t/op/utf8decode.t
old mode 100644 (file)
new mode 100755 (executable)