Re: [perl #18165] "0" fails as right-hand argument to ..

[perl5.git] / win32 / win32.h

diff --git a/win32/win32.h b/win32/win32.h
index 299d8f1..849f13b 100644 (file)
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -72,6 +72,7 @@
 #include <stdio.h>
 #include <direct.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <fcntl.h>
 #ifndef EXT
 #include "EXTERN.h"
@@ -139,6 +140,8 @@ struct utsname {
 #endif
 #define ENV_IS_CASELESS
 
+#define PIPESOCK_MODE  "b"             /* pipes, sockets default to binmode */
+
 #ifndef VER_PLATFORM_WIN32_WINDOWS     /* VC-2.0 headers don't have this */
 #define VER_PLATFORM_WIN32_WINDOWS     1
 #endif
@@ -200,7 +203,7 @@ struct utsname {
 typedef long           uid_t;
 typedef long           gid_t;
 typedef unsigned short mode_t;
-#pragma  warning(disable: 4018 4035 4101 4102 4244 4245 4761)
+#pragma  warning(disable: 4102)        /* "unreferenced label" */
 
 /* Visual C thinks that a pointer to a member variable is 16 bytes in size. */
 #define PERL_MEMBER_PTR_SIZE   16
@@ -236,6 +239,16 @@ typedef long               gid_t;
 
 /* compatibility stuff for other compilers goes here */
 
+#ifndef _INTPTR_T_DEFINED
+typedef int            intptr_t;
+#  define _INTPTR_T_DEFINED
+#endif
+
+#ifndef _UINTPTR_T_DEFINED
+typedef unsigned int   uintptr_t;
+#  define _UINTPTR_T_DEFINED
+#endif
+
 START_EXTERN_C
 
 /* For UNIX compatibility. */
@@ -247,7 +260,10 @@ extern  gid_t      getegid(void);
 extern  int    setuid(uid_t uid);
 extern  int    setgid(gid_t gid);
 extern  int    kill(int pid, int sig);
-extern  void   *sbrk(int need);
+#ifndef USE_PERL_SBRK
+extern  void   *sbrk(ptrdiff_t need);
+#  define HAS_SBRK_PROTO
+#endif
 extern char *  getlogin(void);
 extern int     chown(const char *p, uid_t o, gid_t g);
 extern  int    mkstemp(const char *path);
@@ -292,10 +308,7 @@ DllExport void             win32_get_child_IO(child_IO_table* ptr);
 extern FILE *          my_fdopen(int, char *);
 #endif
 extern int             my_fclose(FILE *);
-extern int             my_fstat(int fd, struct stat *sbufptr);
-extern int             do_aspawn(void *really, void **mark, void **sp);
-extern int             do_spawn(char *cmd);
-extern int             do_spawn_nowait(char *cmd);
+extern int             my_fstat(int fd, Stat_t *sbufptr);
 extern char *          win32_get_privlib(const char *pl);
 extern char *          win32_get_sitelib(const char *pl);
 extern char *          win32_get_vendorlib(const char *pl);
@@ -357,12 +370,6 @@ struct thread_intern {
     WORD               Wshowwindow;
 };
 
-#ifdef USE_5005THREADS
-#  ifndef USE_DECLSPEC_THREAD
-#    define HAVE_THREAD_INTERN
-#  endif /* !USE_DECLSPEC_THREAD */
-#endif /* USE_5005THREADS */
-
 #define HAVE_INTERP_INTERN
 typedef struct {
     long       num;
@@ -386,9 +393,7 @@ struct interp_intern {
     child_tab *        pseudo_children;
 #endif
     void *     internal_host;
-#ifndef USE_5005THREADS
     struct thread_intern       thr_intern;
-#endif
     UINT       timerid;
     unsigned   poll_count;
     Sighandler_t sigtable[SIG_SIZE];
@@ -417,23 +422,13 @@ DllExport int win32_async_check(pTHX);
 #define w32_sighandler                 (PL_sys_intern.sigtable)
 #define w32_poll_count                 (PL_sys_intern.poll_count)
 #define w32_do_async                   (w32_poll_count++ > WIN32_POLL_INTERVAL)
-#ifdef USE_5005THREADS
-#  define w32_strerror_buffer  (thr->i.Wstrerror_buffer)
-#  define w32_getlogin_buffer  (thr->i.Wgetlogin_buffer)
-#  define w32_crypt_buffer     (thr->i.Wcrypt_buffer)
-#  define w32_servent          (thr->i.Wservent)
-#  define w32_init_socktype    (thr->i.Winit_socktype)
-#  define w32_use_showwindow   (thr->i.Wuse_showwindow)
-#  define w32_showwindow       (thr->i.Wshowwindow)
-#else
-#  define w32_strerror_buffer  (PL_sys_intern.thr_intern.Wstrerror_buffer)
-#  define w32_getlogin_buffer  (PL_sys_intern.thr_intern.Wgetlogin_buffer)
-#  define w32_crypt_buffer     (PL_sys_intern.thr_intern.Wcrypt_buffer)
-#  define w32_servent          (PL_sys_intern.thr_intern.Wservent)
-#  define w32_init_socktype    (PL_sys_intern.thr_intern.Winit_socktype)
-#  define w32_use_showwindow   (PL_sys_intern.thr_intern.Wuse_showwindow)
-#  define w32_showwindow       (PL_sys_intern.thr_intern.Wshowwindow)
-#endif /* USE_5005THREADS */
+#define w32_strerror_buffer    (PL_sys_intern.thr_intern.Wstrerror_buffer)
+#define w32_getlogin_buffer    (PL_sys_intern.thr_intern.Wgetlogin_buffer)
+#define w32_crypt_buffer       (PL_sys_intern.thr_intern.Wcrypt_buffer)
+#define w32_servent            (PL_sys_intern.thr_intern.Wservent)
+#define w32_init_socktype      (PL_sys_intern.thr_intern.Winit_socktype)
+#define w32_use_showwindow     (PL_sys_intern.thr_intern.Wuse_showwindow)
+#define w32_showwindow (PL_sys_intern.thr_intern.Wshowwindow)
 
 /* UNICODE<>ANSI translation helpers */
 /* Use CP_ACP when mode is ANSI */
@@ -477,7 +472,7 @@ DllExport int win32_async_check(pTHX);
  * Control structure for lowio file handles
  */
 typedef struct {
-    long osfhnd;    /* underlying OS file HANDLE */
+    intptr_t osfhnd;/* underlying OS file HANDLE */
     char osfile;    /* attributes of file (e.g., open in text mode?) */
     char pipech;    /* one char buffer for handles opened on pipes */
     int lockinitflag;
@@ -511,7 +506,7 @@ EXTERN_C _CRTIMP ioinfo* __pioinfo[];
 #define _pipech(i)  (_pioinfo(i)->pipech)
 
 /* since we are not doing a dup2(), this works fine */
-#define _set_osfhnd(fh, osfh) (void)(_osfhnd(fh) = (long)osfh)
+#define _set_osfhnd(fh, osfh) (void)(_osfhnd(fh) = (intptr_t)osfh)
 #endif
 #endif
 
@@ -538,7 +533,7 @@ EXTERN_C _CRTIMP ioinfo* __pioinfo[];
 #define EAFNOSUPPORT WSAEAFNOSUPPORT
 #endif
 
-DllExport PerlInterpreter *win32_signal_context(void);
+DllExport void *win32_signal_context(void);
 #define PERL_GET_SIG_CONTEXT win32_signal_context()
 
 #endif /* _INC_WIN32_PERL5 */