At some point the #6234 has been lost from the mainline

[p5sagit/p5-mst-13.2.git] / perl.h

diff --git a/perl.h b/perl.h
index c3baf1f..2959df4 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -425,7 +425,10 @@ int usleep(unsigned int);
 #  define MYSWAP
 #endif
 
-#if !defined(PERL_FOR_X2P) && !defined(WIN32)
+/* 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))
 #  include "embed.h"
 #endif
 
@@ -1754,6 +1757,7 @@ typedef struct clone_params CLONE_PARAMS;
 #else
 # if defined(VMS)
 #   include "vmsish.h"
+#   include "embed.h"
 # else
 #   if defined(PLAN9)
 #     include "./plan9/plan9ish.h"
@@ -1890,7 +1894,7 @@ typedef pthread_key_t     perl_key;
 #endif /* NETWARE */
 #endif /* USE_5005THREADS || USE_ITHREADS */
 
-#ifdef WIN32
+#if defined(WIN32)
 #  include "win32.h"
 #endif
 
@@ -3228,6 +3232,7 @@ END_EXTERN_C
 #endif
 
 #if defined(WIN32)
+/* Now all the config stuff is setup we can include embed.h */
 #  include "embed.h"
 #endif
 
@@ -3926,32 +3931,4 @@ extern void moncontrol(int);
 #include "wince.h"
 #endif
 
-/* These definitions are sneaky.
- * Their only purpose is to avoid warnings on strict ANSI (non-VMS)
- * compilers which get huffy about dollars in identifiers,
- * which is common practise in VMS.  The definitions in the
- * non-VMS branch are not used -- but their only point is to
- * be something non-dollared.  Neither are all instances of
- * dollared variables hidden this way, only at the spots where
- * non-VMS platforms see them. */
-#ifdef VMS
-#define VMS_LIB_INVARGV        LIB$_INVARG
-#define VMS_RMS_DIR    RMS$_DIR
-#define VMS_RMS_FAC    RMS$_FAC
-#define VMS_RMS_IFI    RMS$_IFI
-#define VMS_RMS_ISI    RMS$_ISI
-#define VMS_SS_ACCVIO  SS$_ACCVIO
-#define VMS_SS_IVCHAN  SS$_IVCHAN
-#define VMS_SS_NORMAL  SS$_NORMAL
-#else
-#define VMS_LIB_INVARG EINVAL
-#define VMS_RMS_DIR    EBADF
-#define VMS_RMS_FAC    0
-#define VMS_RMS_IFI    EBADF
-#define VMS_RMS_ISI    EBADF
-#define VMS_SS_ACCVIO  EFAULT
-#define VMS_SS_IVCHAN  EBADF
-#define VMS_SS_NORMAL  0
-#endif
-
 #endif /* Include guard */