From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Sat, 20 Oct 2001 16:44:03 +0000 (+0000)
Subject: Integrate mainline
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3657b6bbfc5744085eac86810d288228432d791b;p=p5sagit%2Fp5-mst-13.2.git

Integrate mainline

p4raw-id: //depot/perlio@12537
---

3657b6bbfc5744085eac86810d288228432d791b
diff --cc perl.h
index 83b51ce,2959df4..1e40d9b
--- a/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