X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32.h;h=8d6b04197dad0901af6c99afb0b0d38888e3b1c8;hb=377729033bd4c3e2f6c0ac6b0d2bde9a83c5da6d;hp=18bf8a2e9611b49be0c33ca0e6e8e4bd7dd33218;hpb=f3986ebb5fa156b34b51584d78a10d0d906dbcd6;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/win32.h b/win32/win32.h index 18bf8a2..8d6b041 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -9,6 +9,32 @@ #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 +#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 @@ -27,6 +53,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 +75,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) */ @@ -60,13 +91,15 @@ #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 @@ -76,17 +109,17 @@ #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++ */ @@ -96,9 +129,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 +150,8 @@ 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); +extern char * getlogin(void); #undef Stat #define Stat win32_stat @@ -118,18 +159,19 @@ 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); +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(void); -extern char * win32SiteLibPath(void); +extern char * win32_perllib_path(char *sfx,...); extern int IsWin95(void); extern int IsWinNT(void); @@ -145,4 +187,45 @@ typedef char * caddr_t; /* In malloc.c (core address). */ #include #include +#ifdef MYMALLOC +#define EMBEDMYMALLOC /**/ +/* #define USE_PERL_SBRK /**/ +/* #define PERL_SBRK_VIA_MALLOC /**/ +#endif + +#if defined(PERLDLL) && !defined(PERL_CORE) +#define PERL_CORE +#endif + +#ifdef USE_BINMODE_SCRIPTS +#define PERL_SCRIPT_MODE "rb" +EXT void win32_strip_return(struct sv *sv); +#else +#define PERL_SCRIPT_MODE "r" +#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 */