X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32.h;h=d2ac9b9a5d49e1f440c48288dadccc36d849e9d5;hb=6ee623d521a149edc6574c512fa951a192cd086a;hp=db87a6dca8e8b2b2ee45d3357dbc59a54883a72f;hpb=c53bd28a003b43d77a08bf70a3cb54001d1f4afe;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/win32.h b/win32/win32.h index db87a6d..d2ac9b9 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -10,11 +10,30 @@ #define _INC_WIN32_PERL5 #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 @@ -56,8 +75,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) */ @@ -74,13 +91,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 @@ -90,17 +109,19 @@ 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 +#define USE_RTL_WAIT /* Borland has a working wait() */ + +#endif #ifdef _MSC_VER /* Microsoft Visual C++ */ @@ -110,10 +131,26 @@ typedef long gid_t; #endif /* _MSC_VER */ -/* compatibility stuff for other compilers goes here */ +#ifdef __MINGW32__ /* Minimal Gnu-Win32 */ +typedef long uid_t; +typedef long gid_t; +#define _environ environ +#define flushall _flushall +#define fcloseall _fcloseall + +#ifndef _O_NOINHERIT +# define _O_NOINHERIT 0x0080 +# ifndef _NO_OLDNAMES +# define O_NOINHERIT _O_NOINHERIT +# endif #endif +#endif /* __MINGW32__ */ + +/* compatibility stuff for other compilers goes here */ + + START_EXTERN_C /* For UNIX compatibility. */ @@ -126,6 +163,8 @@ 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); +extern int chown(const char *p, uid_t o, gid_t g); #undef Stat #define Stat win32_stat @@ -133,17 +172,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(void *sv, 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); @@ -177,20 +218,53 @@ EXT void win32_strip_return(struct sv *sv); #define win32_strip_return(sv) NOOP #endif +#define HAVE_INTERP_INTERN +struct interp_intern { + char * w32_perlshell_tokens; + char ** w32_perlshell_vec; + long w32_perlshell_items; + struct av * w32_fdpid; +#ifndef USE_RTL_WAIT + long w32_num_children; + HANDLE w32_child_pids[MAXIMUM_WAIT_OBJECTS]; +#endif +}; + +#define w32_perlshell_tokens (sys_intern.w32_perlshell_tokens) +#define w32_perlshell_vec (sys_intern.w32_perlshell_vec) +#define w32_perlshell_items (sys_intern.w32_perlshell_items) +#define w32_fdpid (sys_intern.w32_fdpid) + +#ifndef USE_RTL_WAIT +# define w32_num_children (sys_intern.w32_num_children) +# define w32_child_pids (sys_intern.w32_child_pids) +#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; +# 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]; + char Ww32_perllib_root[MAX_PATH+1]; +# ifdef USE_SOCKETS_AS_HANDLES + int Winit_socktype; +# endif +# ifdef HAVE_DES_FCRYPT + char Wcrypt_buffer[30]; +# endif +# ifdef USE_RTL_THREAD_API + void * retv; /* slot for thread return value */ +# endif }; -#endif -#endif +# endif /* !USE_DECLSPEC_THREAD */ +#endif /* USE_THREADS */ #endif /* _INC_WIN32_PERL5 */