X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32.h;h=eb5ecd2971e7e96a00b5173955a8788f3ceb1acf;hb=90fdbbb75512007b809510f03fc507ff5c145e16;hp=81bf5747a94735a90b8c077f49884773fed3b241;hpb=f83751a730227a9002a455128633ba7f41582d91;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/win32.h b/win32/win32.h index 81bf574..eb5ecd2 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -135,6 +135,12 @@ struct utsname { #define USE_FIXED_OSFHANDLE #endif +/* Define PERL_WIN32_SOCK_DLOAD to have Perl dynamically load the winsock + DLL when needed. Don't use if your compiler supports delayloading (ie, VC++ 6.0) + -- BKS 5-29-2000 */ +#if !(defined(_M_IX86) && _MSC_VER >= 1200) +#define PERL_WIN32_SOCK_DLOAD +#endif #define ENV_IS_CASELESS #ifndef VER_PLATFORM_WIN32_WINDOWS /* VC-2.0 headers don't have this */ @@ -200,6 +206,8 @@ typedef unsigned short mode_t; /* Visual C thinks that a pointer to a member variable is 16 bytes in size. */ #define PERL_MEMBER_PTR_SIZE 16 +#define isnan _isnan + #endif /* _MSC_VER */ #ifdef __MINGW32__ /* Minimal Gnu-Win32 */ @@ -211,6 +219,7 @@ typedef long gid_t; #endif #define flushall _flushall #define fcloseall _fcloseall +#define isnan _isnan /* ...same libraries as MSVC */ #ifdef PERL_OBJECT # define MEMBER_TO_FPTR(name) &(name) @@ -337,6 +346,10 @@ extern int IsWin95(void); extern int IsWinNT(void); extern void win32_argv2utf8(int argc, char** argv); +#ifdef PERL_IMPLICIT_SYS +extern void win32_delete_internal_host(void *h); +#endif + extern char * staticlinkmodules[]; END_EXTERN_C @@ -479,5 +492,9 @@ struct interp_intern { */ #include "win32iop.h" +#ifndef WNOHANG +# define WNOHANG 1 +#endif + #endif /* _INC_WIN32_PERL5 */