[win32] various hacks to get mingw32 to build. Sync Makefile with makefile.mk.

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

diff --git a/win32/win32.h b/win32/win32.h
index 9086f31..c1e0121 100644 (file)
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -9,6 +9,29 @@
 #ifndef  _INC_WIN32_PERL5
 #define  _INC_WIN32_PERL5
 
+#ifdef __GNUC__
+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
+#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>
 
@@ -27,6 +50,13 @@
 #include "EXTERN.h"
 #endif
 
+struct tms {
+       long    tms_utime;
+       long    tms_stime;
+       long    tms_cutime;
+       long    tms_cstime;
+};
+
 #ifndef START_EXTERN_C
 #ifdef __cplusplus
 #  define START_EXTERN_C extern "C" {
@@ -42,8 +72,6 @@
 #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) */
@@ -66,7 +94,7 @@
 
 /* Compiler-specific stuff. */
 
-#ifdef __BORLANDC__            /* Microsoft Visual C++ */
+#ifdef __BORLANDC__            /* Borland C++ */
 
 #define _access access
 #define _chdir chdir
@@ -86,7 +114,7 @@
 #pragma warn -csu
 #pragma warn -pro
 
-#else
+#endif
 
 #ifdef _MSC_VER                        /* Microsoft Visual C++ */
 
@@ -96,9 +124,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
 
@@ -111,6 +145,7 @@ 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);
 
 #undef  Stat
 #define  Stat          win32_stat
@@ -118,8 +153,8 @@ extern  int kill(int pid, int sig);
 #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);
 
 #ifndef USE_SOCKETS_AS_HANDLES
 extern FILE *          my_fdopen(int, char *);
@@ -128,8 +163,7 @@ extern int          my_fclose(FILE *);
 extern int             do_aspawn(void* really, void ** mark, void ** arglast);
 extern int             do_spawn(char *cmd);
 extern char            do_exec(char *cmd);
-extern char *          win32PerlLibPath(void);
-extern char *          win32SiteLibPath(void);
+extern char *          win32PerlLibPath(char *sfx,...);
 extern int             IsWin95(void);
 extern int             IsWinNT(void);
 
@@ -151,7 +185,7 @@ typedef  char *             caddr_t;        /* In malloc.c (core address). */
 /* #define PERL_SBRK_VIA_MALLOC        /**/
 #endif
 
-#ifdef PERLDLL
+#if defined(PERLDLL) && !defined(PERL_CORE)
 #define PERL_CORE
 #endif
 
@@ -163,4 +197,20 @@ 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
+{
+ char          Wstrerror_buffer[512];
+ struct servent Wservent;
+};
+#endif
+#endif
+
 #endif /* _INC_WIN32_PERL5 */