make 4-arg win32_select() sleep more reasonably on false values

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

diff --git a/win32/win32.h b/win32/win32.h
index ceee4fe..c251a31 100644 (file)
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -14,7 +14,7 @@
 #  ifdef PERL_GLOBAL_STRUCT
 #    error PERL_GLOBAL_STRUCT cannot be defined with PERL_OBJECT
 #  endif
-#  define win32_get_stdlib PerlEnv_lib_path
+#  define win32_get_privlib PerlEnv_lib_path
 #  define win32_get_sitelib PerlEnv_sitelib_path
 #endif
 
@@ -31,9 +31,6 @@ typedef long long __int64;
 #define __declspec(x)
 #define PERL_GLOBAL_STRUCT
 #define MULTIPLICITY
-#ifndef TLS_OUT_OF_INDEXES
-#define TLS_OUT_OF_INDEXES (DWORD)0xFFFFFFFF
-#endif
 #endif
 
 /* Define DllExport akin to perl's EXT, 
@@ -46,7 +43,8 @@ typedef long long __int64;
 #define DllExport
 #else
 #if defined(PERLDLL) || defined(WIN95FIX)
-#define DllExport __declspec(dllexport)
+#define DllExport
+/*#define DllExport __declspec(dllexport)*/    /* noises with VC5+sp3 */
 #else 
 #define DllExport __declspec(dllimport)
 #endif
@@ -57,9 +55,12 @@ typedef long long __int64;
 
 #ifdef   WIN32_LEAN_AND_MEAN           /* C file is NOT a Perl5 original. */
 #define  CONTEXT       PERL_CONTEXT    /* Avoid conflict of CONTEXT defs. */
-#define  index         strchr          /* Why 'index'? */
 #endif /*WIN32_LEAN_AND_MEAN */
 
+#ifndef TLS_OUT_OF_INDEXES
+#define TLS_OUT_OF_INDEXES (DWORD)0xFFFFFFFF
+#endif
+
 #include <dirent.h>
 #include <io.h>
 #include <process.h>
@@ -110,10 +111,14 @@ struct tms {
 
 #define ENV_IS_CASELESS
 
-#ifndef VER_PLATFORM_WIN32_WINDOWS     /* VC-2.0 headers dont have this */
+#ifndef VER_PLATFORM_WIN32_WINDOWS     /* VC-2.0 headers don't have this */
 #define VER_PLATFORM_WIN32_WINDOWS     1
 #endif
 
+#ifndef FILE_SHARE_DELETE              /* VC-4.0 headers don't have this */
+#define FILE_SHARE_DELETE              0x00000004
+#endif
+
 /* Compiler-specific stuff. */
 
 #ifdef __BORLANDC__            /* Borland C++ */
@@ -151,6 +156,55 @@ typedef long               uid_t;
 typedef long           gid_t;
 #pragma  warning(disable: 4018 4035 4101 4102 4244 4245 4761)
 
+#ifndef PERL_OBJECT
+
+/* Visual C thinks that a pointer to a member variable is 16 bytes in size. */
+#define STRUCT_MGVTBL_DEFINITION                                       \
+struct mgvtbl {                                                                \
+    union {                                                            \
+       int         (CPERLscope(*svt_get))      _((SV *sv, MAGIC* mg)); \
+       char        handle_VC_problem1[16];                             \
+    };                                                                 \
+    union {                                                            \
+       int         (CPERLscope(*svt_set))      _((SV *sv, MAGIC* mg)); \
+       char        handle_VC_problem2[16];                             \
+    };                                                                 \
+    union {                                                            \
+       U32         (CPERLscope(*svt_len))      _((SV *sv, MAGIC* mg)); \
+       char        handle_VC_problem3[16];                             \
+    };                                                                 \
+    union {                                                            \
+       int         (CPERLscope(*svt_clear))    _((SV *sv, MAGIC* mg)); \
+       char        handle_VC_problem4[16];                             \
+    };                                                                 \
+    union {                                                            \
+       int         (CPERLscope(*svt_free))     _((SV *sv, MAGIC* mg)); \
+       char        handle_VC_problem5[16];                             \
+    };                                                                 \
+}
+
+#define BASEOP_DEFINITION              \
+    OP*                op_next;                \
+    OP*                op_sibling;             \
+    OP*                (CPERLscope(*op_ppaddr))_((ARGSproto));         \
+    char       handle_VC_problem[12];  \
+    PADOFFSET  op_targ;                \
+    OPCODE     op_type;                \
+    U16                op_seq;                 \
+    U8         op_flags;               \
+    U8         op_private;
+
+#define UNION_ANY_DEFINITION union any {               \
+    void*      any_ptr;                                \
+    I32                any_i32;                                \
+    IV         any_iv;                                 \
+    long       any_long;                               \
+    void       (CPERLscope(*any_dptr)) _((void*));     \
+    char       handle_VC_problem[16];                  \
+}
+
+#endif /* PERL_OBJECT */
+
 #endif /* _MSC_VER */
 
 #ifdef __MINGW32__             /* Minimal Gnu-Win32 */
@@ -213,7 +267,7 @@ extern int          do_aspawn(void *really, void **mark, void **sp);
 extern int             do_spawn(char *cmd);
 extern int             do_spawn_nowait(char *cmd);
 extern char            do_exec(char *cmd);
-extern char *          win32_get_stdlib(char *pl);
+extern char *          win32_get_privlib(char *pl);
 extern char *          win32_get_sitelib(char *pl);
 extern int             IsWin95(void);
 extern int             IsWinNT(void);