X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32.h;h=c1e01219320e46b22bb9ccbcea6349666f6210f2;hb=910dfcc863de04bd9adf089d5f905cb1c045b99f;hp=8cf8b7c01ccde01176e7cfd603ddda441430ff81;hpb=2bc71ef813f5d9e1635af64220cf742859485b38;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/win32.h b/win32/win32.h index 8cf8b7c..c1e0121 100644 --- 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 @@ -22,15 +45,65 @@ #include #include #include +#include +#ifndef EXT +#include "EXTERN.h" +#endif -/* For UNIX compatibility. */ +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" { +# define END_EXTERN_C } +# define EXTERN_C extern "C" +#else +# define START_EXTERN_C +# define END_EXTERN_C +# define EXTERN_C +#endif +#endif + +#define STANDARD_C 1 +#define DOSISH 1 /* no escaping our roots */ +#define OP_BINARY O_BINARY /* mistake in in pp_sys.c? */ + +/* Define USE_SOCKETS_AS_HANDLES to enable emulation of windows sockets as + * real filehandles. XXX Should always be defined (the other version is untested) */ +#define USE_SOCKETS_AS_HANDLES + +/* if USE_WIN32_RTL_ENV is not defined, Perl uses direct Win32 calls + * to read the environment, bypassing the runtime's (usually broken) + * facilities for accessing the same. See note in util.c/my_setenv(). */ +/*#define USE_WIN32_RTL_ENV */ + +/* Define USE_FIXED_OSFHANDLE to fix VC's _open_osfhandle() on W95. + * Can only enable it if not using the DLL CRT (it doesn't expose internals) */ +#if defined(_MSC_VER) && !defined(_DLL) && defined(_M_IX86) +#define USE_FIXED_OSFHANDLE +#endif + +#ifndef VER_PLATFORM_WIN32_WINDOWS /* VC-2.0 headers dont have this */ +#define VER_PLATFORM_WIN32_WINDOWS 1 +#endif + +/* Compiler-specific stuff. */ -#ifdef __BORLANDC__ +#ifdef __BORLANDC__ /* Borland C++ */ #define _access access #define _chdir chdir #include +#ifndef DllMain +#define DllMain DllEntryPoint +#endif + #pragma warn -ccc #pragma warn -rch #pragma warn -sig @@ -41,12 +114,29 @@ #pragma warn -csu #pragma warn -pro -#else +#endif + +#ifdef _MSC_VER /* Microsoft Visual C++ */ + +typedef long uid_t; +typedef long gid_t; +#pragma warning(disable: 4018 4035 4101 4102 4244 4245 4761) + +#endif /* _MSC_VER */ + +#ifdef __MINGW32__ /* Minimal Gnu-Win32 */ typedef long uid_t; typedef long gid_t; -#endif +#endif /* __MINGW32__ */ + +/* compatibility stuff for other compilers goes here */ + + +START_EXTERN_C + +/* For UNIX compatibility. */ extern uid_t getuid(void); extern gid_t getgid(void); @@ -54,95 +144,73 @@ extern uid_t geteuid(void); 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 *staticlinkmodules[]; +#undef Stat +#define Stat win32_stat -/* if USE_WIN32_RTL_ENV is not defined, Perl uses direct Win32 calls - * to read the environment, bypassing the runtime's (usually broken) - * facilities for accessing the same. See note in util.c/my_setenv(). - */ -/*#define USE_WIN32_RTL_ENV */ +#undef init_os_extras +#define init_os_extras Perl_init_os_extras -#ifndef USE_WIN32_RTL_ENV -#include -#ifndef EXT -#include "EXTERN.h" -#endif -#undef getenv -#define getenv win32_getenv -EXT char *win32_getenv(const char *name); -#endif +DllExport void Perl_win32_init(int *argcp, char ***argvp); +DllExport void Perl_init_os_extras(void); -#define USE_SOCKETS_AS_HANDLES #ifndef USE_SOCKETS_AS_HANDLES -extern FILE *myfdopen(int, char *); - -#undef fdopen -#define fdopen myfdopen -#endif /* USE_SOCKETS_AS_HANDLES */ - -#define STANDARD_C 1 /* Perl5 likes standard C. */ -#define DOSISH 1 /* Take advantage of DOSish code in Perl5. */ - -#define OP_BINARY O_BINARY /* Mistake in in pp_sys.c. */ - -#undef pipe -#define pipe(fd) win32_pipe((fd), 512, O_BINARY) /* the pipe call is a bit different */ - -#undef pause -#define pause() sleep((32767L << 16) + 32767) - - -#undef times -#define times mytimes - -#undef alarm -#define alarm myalarm +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_spawn(char *cmd); +extern char do_exec(char *cmd); +extern char * win32PerlLibPath(char *sfx,...); +extern int IsWin95(void); +extern int IsWinNT(void); -struct tms { - long tms_utime; - long tms_stime; - long tms_cutime; - long tms_cstime; -}; +extern char * staticlinkmodules[]; -unsigned int sleep(unsigned int); -char *win32PerlLibPath(void); -char *win32SiteLibPath(void); -int mytimes(struct tms *timebuf); -unsigned int myalarm(unsigned int sec); -int do_aspawn(void* really, void** mark, void** arglast); -int do_spawn(char *cmd); -char do_exec(char *cmd); -void init_os_extras(void); +END_EXTERN_C typedef char * caddr_t; /* In malloc.c (core address). */ /* - * Extension Library, only good for VC - */ - -#define DllExport __declspec(dllexport) -#define DllImport __declspec(dllimport) - -/* * handle socket stuff, assuming socket is always available */ - #include #include -#ifdef _MSC_VER -#pragma warning(disable: 4018 4035 4101 4102 4244 4245 4761) +#ifdef MYMALLOC +#define EMBEDMYMALLOC /**/ +/* #define USE_PERL_SBRK /**/ +/* #define PERL_SBRK_VIA_MALLOC /**/ #endif -int IsWin95(void); -int IsWinNT(void); +#if defined(PERLDLL) && !defined(PERL_CORE) +#define PERL_CORE +#endif -#ifndef VER_PLATFORM_WIN32_WINDOWS /* VC-2.0 headers dont have this */ -#define VER_PLATFORM_WIN32_WINDOWS 1 +#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 +{ + char Wstrerror_buffer[512]; + struct servent Wservent; +}; +#endif #endif #endif /* _INC_WIN32_PERL5 */