X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32.h;h=a6a2f9d5c5f7013f9e8ce50084edc8989e54310d;hb=3e83fff7485ec2aa4f013e05fa43596a76f92102;hp=c1e01219320e46b22bb9ccbcea6349666f6210f2;hpb=910dfcc863de04bd9adf089d5f905cb1c045b99f;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/win32.h b/win32/win32.h index c1e0121..a6a2f9d 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -9,15 +9,31 @@ #ifndef _INC_WIN32_PERL5 #define _INC_WIN32_PERL5 +#ifdef PERL_OBJECT +# define WIN32IO_IS_STDIO /* don't pull in custom stdio layer */ +# ifdef PERL_GLOBAL_STRUCT +# error PERL_GLOBAL_STRUCT cannot be defined with PERL_OBJECT +# endif +# define win32_get_privlib PerlEnv_lib_path +# define win32_get_sitelib PerlEnv_sitelib_path +#endif + #ifdef __GNUC__ typedef long long __int64; #define Win32_Winsock +# ifdef __cplusplus +#undef __attribute__ /* seems broken in 2.8.0 */ +#define __attribute__(p) +# endif /* 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, @@ -26,18 +42,22 @@ typedef long long __int64; * otherwise import it. */ +#if defined(PERL_OBJECT) +#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 +#endif #define WIN32_LEAN_AND_MEAN #include #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 */ #include @@ -88,6 +108,8 @@ 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 @@ -104,15 +126,22 @@ 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" */ + +#define USE_RTL_WAIT /* Borland has a working wait() */ + +/* Borland is picky about a bare member function name used as its ptr */ +#ifdef PERL_OBJECT +#define FUNC_NAME_TO_PTR(name) &(name) +#endif #endif @@ -128,6 +157,23 @@ typedef long gid_t; 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 + +#ifndef _O_NOINHERIT +# define _O_NOINHERIT 0x0080 +# ifndef _NO_OLDNAMES +# define O_NOINHERIT _O_NOINHERIT +# endif +#endif #endif /* __MINGW32__ */ @@ -146,6 +192,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 @@ -155,15 +203,18 @@ extern void *sbrk(int need); 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_get_privlib(char *pl); +extern char * win32_get_sitelib(char *pl); extern int IsWin95(void); extern int IsWinNT(void); @@ -197,20 +248,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 */