In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/4eab039da16f1fc2e246f94a6af541703e6a7e9b?hp=d1790986d15fcf8b76a2710320ae50eee3948e74>
- Log ----------------------------------------------------------------- commit 4eab039da16f1fc2e246f94a6af541703e6a7e9b Author: Steve Hay <[email protected]> Date: Sat Aug 18 10:39:56 2012 +0100 We don't support compilers other than MS VC++ and MinGW/gcc on Windows M win32/win32.c M win32/win32.h M win32/win32iop-o.h M win32/win32iop.h commit 955420131882fde0abd8c1d4226cbcc1880a362b Author: Steve Hay <[email protected]> Date: Sat Aug 18 10:36:12 2012 +0100 Remove two unused #defines M win32/win32.h commit 70764c007ceeb334786268595379106e4c1382b5 Author: Steve Hay <[email protected]> Date: Sat Aug 18 10:33:13 2012 +0100 We don't support MS VC++ < 6.0 M handy.h M win32/win32.h ----------------------------------------------------------------------- Summary of changes: handy.h | 2 +- win32/win32.c | 7 +------ win32/win32.h | 35 ++++++----------------------------- win32/win32iop-o.h | 6 +----- win32/win32iop.h | 6 +----- 5 files changed, 10 insertions(+), 46 deletions(-) diff --git a/handy.h b/handy.h index f83bce5..c670398 100644 --- a/handy.h +++ b/handy.h @@ -123,7 +123,7 @@ Null SV pointer. (No longer available when C<PERL_CORE> is defined.) #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__SUNPRO_C)) /* C99 or close enough. */ # define FUNCTION__ __func__ #else -# if (defined(_MSC_VER) && _MSC_VER < 1300) || /* Pre-MSVC 7.0 has neither __func__ nor __FUNCTION and no good workarounds, either. */ \ +# if (defined(_MSC_VER) && _MSC_VER < 1300) || /* MSVC6 has neither __func__ nor __FUNCTION and no good workarounds, either. */ \ (defined(__DECC_VER)) /* Tru64 or VMS, and strict C89 being used, but not modern enough cc (in Tur64, -c99 not known, only -std1). */ # define FUNCTION__ "" # else diff --git a/win32/win32.c b/win32/win32.c index 024a2a8..4038316 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -64,12 +64,7 @@ #include <stdarg.h> #include <float.h> #include <time.h> - -#if defined(_MSC_VER) || defined(__MINGW32__) -# include <sys/utime.h> -#else -# include <utime.h> -#endif +#include <sys/utime.h> #ifdef __GNUC__ /* Mingw32 defaults to globing command line diff --git a/win32/win32.h b/win32/win32.h index 808ea19..7ac70ad 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -48,8 +48,7 @@ /* now even GCC supports __declspec() */ #if defined(PERLDLL) -#define DllExport -/*#define DllExport __declspec(dllexport)*/ /* noises with VC5+sp3 */ +#define DllExport __declspec(dllexport) #else #define DllExport __declspec(dllimport) #endif @@ -167,24 +166,10 @@ struct utsname { #define PERL_NO_FORCE_LINK /* no need for PL_force_link_funcs */ -/* 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 #define PIPESOCK_MODE "b" /* pipes, sockets default to binmode */ -#ifndef VER_PLATFORM_WIN32_WINDOWS /* VC-2.0 headers don't have this */ -#define VER_PLATFORM_WIN32_WINDOWS 1 -#endif - -#ifndef FILE_SHARE_DELETE /* VC-4.0 headers don't have this */ -#define FILE_SHARE_DELETE 0x00000004 -#endif - /* access() mode bits */ #ifndef R_OK # define R_OK 4 @@ -202,13 +187,11 @@ struct utsname { /* Compiler-specific stuff. */ -#if defined(_MSC_VER) || defined(__MINGW32__) /* VC uses non-standard way to determine the size and alignment if bit-fields */ -/* MinGW will compiler with -mms-bitfields, so should use the same types */ -# define PERL_BITFIELD8 unsigned char -# define PERL_BITFIELD16 unsigned short -# define PERL_BITFIELD32 unsigned int -#endif +/* MinGW will compile with -mms-bitfields, so should use the same types */ +#define PERL_BITFIELD8 unsigned char +#define PERL_BITFIELD16 unsigned short +#define PERL_BITFIELD32 unsigned int #ifdef _MSC_VER /* Microsoft Visual C++ */ @@ -220,9 +203,6 @@ typedef unsigned short mode_t; #pragma warning(disable: 4102) /* "unreferenced label" */ -/* Visual C thinks that a pointer to a member variable is 16 bytes in size. */ -#define PERL_MEMBER_PTR_SIZE 16 - #define isnan _isnan #define snprintf _snprintf #define vsnprintf _vsnprintf @@ -265,14 +245,11 @@ typedef long gid_t; # endif #endif -#endif /* __MINGW32__ */ - -/* both GCC/Mingw32 and MSVC++ 4.0 are missing this, so we put it here */ #ifndef CP_UTF8 # define CP_UTF8 65001 #endif -/* compatibility stuff for other compilers goes here */ +#endif /* __MINGW32__ */ #ifndef _INTPTR_T_DEFINED typedef int intptr_t; diff --git a/win32/win32iop-o.h b/win32/win32iop-o.h index 6633f7a..2b766dc 100644 --- a/win32/win32iop-o.h +++ b/win32/win32iop-o.h @@ -16,11 +16,7 @@ #endif #ifndef UNDER_CE -#if defined(_MSC_VER) || defined(__MINGW32__) -# include <sys/utime.h> -#else -# include <utime.h> -#endif +#include <sys/utime.h> #endif /* diff --git a/win32/win32iop.h b/win32/win32iop.h index cbc9716..caf87ae 100644 --- a/win32/win32iop.h +++ b/win32/win32iop.h @@ -13,11 +13,7 @@ #endif #endif -#if defined(_MSC_VER) || defined(__MINGW32__) -# include <sys/utime.h> -#else -# include <utime.h> -#endif +#include <sys/utime.h> /* * defines for flock emulation -- Perl5 Master Repository
