diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2000-06-22 16:07:51 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2000-06-22 16:07:51 +0000 |
| commit | 94414bfbc497e71da32f6edca513d34725e3cae6 (patch) | |
| tree | df134c1bf15f778e1baa8bea417c8660229eff66 | |
| parent | f8519be6fd9bf0423897a621d943e29ddc834d84 (diff) | |
| download | perl-94414bfbc497e71da32f6edca513d34725e3cae6.tar.gz | |
Win32 patches from Benjamin Stuhl.
p4raw-id: //depot/cfgperl@6220
| -rw-r--r-- | makedef.pl | 3 | ||||
| -rw-r--r-- | win32/win32.h | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/makedef.pl b/makedef.pl index ae68674aa7..cb7faed663 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 3929bcc15c..2e5b0740dd 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) |