[asperl] added AS patch#6

[perl5.git] / win32 / win32.h

diff --git a/win32/win32.h b/win32/win32.h
index 93b74ef..31aadf9 100644 (file)
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -9,13 +9,41 @@
 #ifndef  _INC_WIN32_PERL5
 #define  _INC_WIN32_PERL5
 
+#ifdef PERL_OBJECT
+#define ENV_HV_NAME "ENV_HV_NAME"
+#define DYNAMIC_ENV_FETCH
+#define prime_env_iter()
+#ifdef PERL_GLOBAL_STRUCT
+#error PERL_GLOBAL_STRUCT cannot be defined with PERL_OBJECT
+#endif
+#define win32_perllib_path PerlEnv_lib_path
+#endif
+
 #ifdef __GNUC__
-#define __declspec(x)
 typedef long long __int64;
 #define Win32_Winsock
+/* GCC does not do __declspec() - render it a nop 
+ * and turn on options to avoid importing data 
+ */
+#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, 
+ * If we are in the DLL or mimicing the DLL for Win95 work round
+ * then Export the symbol, 
+ * otherwise import it.
+ */
 
+#if defined(PERLDLL) || defined(WIN95FIX)
+#define DllExport __declspec(dllexport)
+#else 
+#define DllExport __declspec(dllimport)
+#endif
 
 #define  WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -57,8 +85,6 @@ struct tms {
 #define  STANDARD_C    1
 #define  DOSISH                1               /* no escaping our roots */
 #define  OP_BINARY     O_BINARY        /* mistake in in pp_sys.c? */
-#define DllExport      __declspec(dllexport)
-#define DllImport      __declspec(dllimport)
 
 /* Define USE_SOCKETS_AS_HANDLES to enable emulation of windows sockets as
  * real filehandles. XXX Should always be defined (the other version is untested) */
@@ -75,13 +101,15 @@ 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
 
 /* Compiler-specific stuff. */
 
-#ifdef __BORLANDC__            /* Microsoft Visual C++ */
+#ifdef __BORLANDC__            /* Borland C++ */
 
 #define _access access
 #define _chdir chdir
@@ -91,17 +119,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" */
 
-#else
+#endif
 
 #ifdef _MSC_VER                        /* Microsoft Visual C++ */
 
@@ -111,9 +139,15 @@ typedef long               gid_t;
 
 #endif /* _MSC_VER */
 
+#ifdef __MINGW32__             /* Minimal Gnu-Win32 */
+
+typedef long           uid_t;
+typedef long           gid_t;
+
+#endif /* __MINGW32__ */
+
 /* compatibility stuff for other compilers goes here */
 
-#endif
 
 START_EXTERN_C
 
@@ -127,6 +161,7 @@ extern  int setuid(uid_t uid);
 extern  int    setgid(gid_t gid);
 extern  int    kill(int pid, int sig);
 extern  void   *sbrk(int need);
+extern char *  getlogin(void);
 
 #undef  Stat
 #define  Stat          win32_stat
@@ -134,17 +169,19 @@ extern  void      *sbrk(int need);
 #undef   init_os_extras
 #define  init_os_extras Perl_init_os_extras
 
-EXT void               Perl_win32_init(int *argcp, char ***argvp);
-EXT void               Perl_init_os_extras(void);
+DllExport void         Perl_win32_init(int *argcp, char ***argvp);
+DllExport void         Perl_init_os_extras(void);
+DllExport void         win32_str_os_error(struct sv *s, DWORD err);
 
 #ifndef USE_SOCKETS_AS_HANDLES
 extern FILE *          my_fdopen(int, char *);
 #endif
 extern int             my_fclose(FILE *);
-extern int             do_aspawn(void* really, void ** mark, void ** arglast);
+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 *          win32PerlLibPath(char *sfx,...);
+extern char *          win32_perllib_path(char *sfx,...);
 extern int             IsWin95(void);
 extern int             IsWinNT(void);
 
@@ -178,4 +215,27 @@ EXT void win32_strip_return(struct sv *sv);
 #define win32_strip_return(sv) NOOP
 #endif
 
+/* 
+ * Now Win32 specific per-thread data stuff 
+ */
+
+#ifdef USE_THREADS
+#  ifndef USE_DECLSPEC_THREAD
+#    define HAVE_THREAD_INTERN
+
+struct thread_intern {
+    /* XXX can probably use one buffer instead of several */
+    char               Wstrerror_buffer[512];
+    struct servent     Wservent;
+    char               Wgetlogin_buffer[128];
+#    ifdef HAVE_DES_FCRYPT
+    char               Wcrypt_buffer[30];
+#    endif
+#    ifdef USE_RTL_THREAD_API
+    void *             retv;   /* slot for thread return value */
+#    endif
+};
+#  endif /* !USE_DECLSPEC_THREAD */
+#endif /* USE_THREADS */
+
 #endif /* _INC_WIN32_PERL5 */