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 6f3026c..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
 
@@ -1632,6 +1635,8 @@ typedef struct mgvtbl MGVTBL;
 typedef union any ANY;
 typedef struct ptr_tbl_ent PTR_TBL_ENT_t;
 typedef struct ptr_tbl PTR_TBL_t;
+typedef struct clone_params CLONE_PARAMS;
+
 
 #include "handy.h"
 
@@ -1752,6 +1757,7 @@ typedef struct ptr_tbl PTR_TBL_t;
 #else
 # if defined(VMS)
 #   include "vmsish.h"
+#   include "embed.h"
 # else
 #   if defined(PLAN9)
 #     include "./plan9/plan9ish.h"
@@ -1888,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
 
@@ -3050,7 +3056,6 @@ enum {            /* pass one of these to get_vtbl */
 #define HINT_STRICT_REFS       0x00000002
 #define HINT_LOCALE            0x00000004
 #define HINT_BYTES             0x00000008
-#define HINT_BYTES             0x00000008
 /* #define HINT_notused10      0x00000010 */
                                /* Note: 20,40,80 used for NATIVE_HINTS */
 
@@ -3227,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