From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Thu, 22 Jun 2000 16:07:51 +0000 (+0000)
Subject: Win32 patches from Benjamin Stuhl.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=94414bfbc497e71da32f6edca513d34725e3cae6;p=p5sagit%2Fp5-mst-13.2.git

Win32 patches from Benjamin Stuhl.

p4raw-id: //depot/cfgperl@6220
---

diff --git a/makedef.pl b/makedef.pl
index ae68674..cb7faed 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -402,6 +402,8 @@ unless ($define{'USE_5005THREADS'}) {
 		    PL_svref_mutex
 		    PL_cred_mutex
 		    PL_eval_mutex
+		    PL_fdpid_mutex
+		    PL_sv_lock_mutex
 		    PL_eval_cond
 		    PL_eval_owner
 		    PL_threads_mutex
@@ -418,6 +420,7 @@ unless ($define{'USE_5005THREADS'}) {
 		    Perl_find_threadsv
 		    Perl_unlock_condpair
 		    Perl_magic_mutexfree
+		    Perl_lock
 		    )];
 }
 
diff --git a/win32/win32.h b/win32/win32.h
index 3929bcc..2e5b074 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 */
@@ -213,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)