[win32] integrate mainline

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

diff --git a/win32/win32.h b/win32/win32.h
index 8075ee7..d2ac9b9 100644 (file)
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -91,6 +91,8 @@ struct tms {
 #define USE_FIXED_OSFHANDLE
 #endif
 
+#define ENV_IS_CASELESS
+
 #ifndef VER_PLATFORM_WIN32_WINDOWS     /* VC-2.0 headers dont have this */
 #define VER_PLATFORM_WIN32_WINDOWS     1
 #endif
@@ -107,15 +109,17 @@ struct tms {
 #define DllMain DllEntryPoint
 #endif
 
-#pragma warn -ccc
-#pragma warn -rch
-#pragma warn -sig
-#pragma warn -pia
-#pragma warn -par
-#pragma warn -aus
-#pragma warn -use
-#pragma warn -csu
-#pragma warn -pro
+#pragma warn -ccc      /* "condition is always true/false" */
+#pragma warn -rch      /* "unreachable code" */
+#pragma warn -sig      /* "conversion may lose significant digits" */
+#pragma warn -pia      /* "possibly incorrect assignment" */
+#pragma warn -par      /* "parameter 'foo' is never used" */
+#pragma warn -aus      /* "'foo' is assigned a value that is never used" */
+#pragma warn -use      /* "'foo' is declared but never used" */
+#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
 
@@ -131,6 +135,16 @@ typedef long               gid_t;
 
 typedef long           uid_t;
 typedef long           gid_t;
+#define _environ       environ
+#define flushall       _flushall
+#define fcloseall      _fcloseall
+
+#ifndef _O_NOINHERIT
+#  define _O_NOINHERIT 0x0080
+#  ifndef _NO_OLDNAMES
+#    define O_NOINHERIT        _O_NOINHERIT
+#  endif
+#endif
 
 #endif /* __MINGW32__ */
 
@@ -150,6 +164,7 @@ extern  int setgid(gid_t gid);
 extern  int    kill(int pid, int sig);
 extern  void   *sbrk(int need);
 extern char *  getlogin(void);
+extern int     chown(const char *p, uid_t o, gid_t g);
 
 #undef  Stat
 #define  Stat          win32_stat
@@ -159,6 +174,7 @@ extern      char *  getlogin(void);
 
 DllExport void         Perl_win32_init(int *argcp, char ***argvp);
 DllExport void         Perl_init_os_extras(void);
+DllExport void         win32_str_os_error(void *sv, DWORD err);
 
 #ifndef USE_SOCKETS_AS_HANDLES
 extern FILE *          my_fdopen(int, char *);
@@ -202,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 
  */
@@ -215,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