[win32] integrate mainline

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

diff --git a/win32/win32.h b/win32/win32.h
index 259ffdc..d2ac9b9 100644 (file)
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -119,6 +119,8 @@ struct tms {
 #pragma warn -csu      /* "comparing signed and unsigned values" */
 #pragma warn -pro      /* "call to function with no prototype" */
 
+#define USE_RTL_WAIT   /* Borland has a working wait() */
+
 #endif
 
 #ifdef _MSC_VER                        /* Microsoft Visual C++ */
@@ -216,6 +218,28 @@ EXT void win32_strip_return(struct sv *sv);
 #define win32_strip_return(sv) NOOP
 #endif
 
+#define HAVE_INTERP_INTERN
+struct interp_intern {
+    char *     w32_perlshell_tokens;
+    char **    w32_perlshell_vec;
+    long       w32_perlshell_items;
+    struct av *        w32_fdpid;
+#ifndef USE_RTL_WAIT
+    long       w32_num_children;
+    HANDLE     w32_child_pids[MAXIMUM_WAIT_OBJECTS];
+#endif
+};
+
+#define w32_perlshell_tokens   (sys_intern.w32_perlshell_tokens)
+#define w32_perlshell_vec      (sys_intern.w32_perlshell_vec)
+#define w32_perlshell_items    (sys_intern.w32_perlshell_items)
+#define w32_fdpid              (sys_intern.w32_fdpid)
+
+#ifndef USE_RTL_WAIT
+#  define w32_num_children     (sys_intern.w32_num_children)
+#  define w32_child_pids       (sys_intern.w32_child_pids)
+#endif
+
 /* 
  * Now Win32 specific per-thread data stuff 
  */
@@ -229,6 +253,10 @@ struct thread_intern {
     char               Wstrerror_buffer[512];
     struct servent     Wservent;
     char               Wgetlogin_buffer[128];
+    char               Ww32_perllib_root[MAX_PATH+1];
+#    ifdef USE_SOCKETS_AS_HANDLES
+    int                        Winit_socktype;
+#    endif
 #    ifdef HAVE_DES_FCRYPT
     char               Wcrypt_buffer[30];
 #    endif