X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32.h;h=61884ab7a78f724566f0a6cf67740454bfd812b3;hb=1307044d1712ffdf799e228d9d670bbf155291ad;hp=35d5bdfa9857fbc4bb81b4b4abb04e05b527890d;hpb=1c0ca838512883f7a705e306f80a7c0a95277a87;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/win32.h b/win32/win32.h
index 35d5bdf..61884ab 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 */
@@ -153,6 +159,11 @@ struct utsname {
 #  define	F_OK	0
 #endif
 
+/* for waitpid() */
+#ifndef WNOHANG
+#  define WNOHANG	1
+#endif
+
 #define PERL_GET_CONTEXT_DEFINED
 
 /* Compiler-specific stuff. */
@@ -188,6 +199,8 @@ struct utsname {
 /* Borland C thinks that a pointer to a member variable is 12 bytes in size. */
 #define PERL_MEMBER_PTR_SIZE	12
 
+#define isnan		_isnan
+
 #endif
 
 #ifdef _MSC_VER			/* Microsoft Visual C++ */
@@ -200,6 +213,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 +226,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)