Integrate mainline

p4raw-id: //depot/perlio@12537

diff --cc perl.h
index 83b51ce,2959df4..1e40d9b
--- 1/perl.h
--- 2/perl.h
+++ b/perl.h
@@@ -425,10 -425,10 +425,10 @@@ 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)
+ #if !defined(PERL_FOR_X2P) && !(defined(WIN32)||defined(VMS))
  #  include "embed.h"
  #endif