diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 2000-07-11 17:48:28 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 2000-07-11 17:48:28 +0000 |
| commit | 6940069f6d5beebb5f66572e358b4e7d0c3d1c43 (patch) | |
| tree | 1ec564cae83fe8b5bf2813e3e62004aac0d7fcac /win32/win32.h | |
| parent | 2579426e47320c9ace24a5a2459d12ebcdedba4c (diff) | |
| download | perl-6940069f6d5beebb5f66572e358b4e7d0c3d1c43.tar.gz | |
integrate cfgperl changes#6220..6222 into mainline
p4raw-link: @6222 on //depot/cfgperl: cb6e01d9fd93f1025bb60ed9c000931b2c8542a3
p4raw-link: @6220 on //depot/cfgperl: 94414bfbc497e71da32f6edca513d34725e3cae6
p4raw-id: //depot/perl@6350
p4raw-integrated: from //depot/cfgperl@6349 'copy in' lib/Pod/Usage.pm
(@5717..) win32/win32.h (@6026..) pod/perlop.pod (@6206..)
p4raw-integrated: from //depot/cfgperl@6221 'copy in' utf8.c (@6174..)
doop.c (@6193..) toke.c (@6196..) 'merge in' embed.pl (@6217..)
p4raw-integrated: from //depot/cfgperl@6220 'merge in' makedef.pl
(@6156..)
Diffstat (limited to 'win32/win32.h')
| -rw-r--r-- | win32/win32.h | 7 |
1 files changed, 7 insertions, 0 deletions
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) |