diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2012-08-18 10:39:56 +0100 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2012-08-18 10:39:56 +0100 |
| commit | 4eab039da16f1fc2e246f94a6af541703e6a7e9b (patch) | |
| tree | 7fe9b2f77d1a5d19bb14c207ba70f5fa116a35c3 | |
| parent | 955420131882fde0abd8c1d4226cbcc1880a362b (diff) | |
| download | perl-4eab039da16f1fc2e246f94a6af541703e6a7e9b.tar.gz | |
We don't support compilers other than MS VC++ and MinGW/gcc on Windows
| -rw-r--r-- | win32/win32.c | 7 | ||||
| -rw-r--r-- | win32/win32.h | 12 | ||||
| -rw-r--r-- | win32/win32iop-o.h | 6 | ||||
| -rw-r--r-- | win32/win32iop.h | 6 |
4 files changed, 7 insertions, 24 deletions
diff --git a/win32/win32.c b/win32/win32.c index 024a2a846e..4038316849 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 789671f866..7ac70ad74c 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -187,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++ */ @@ -253,8 +251,6 @@ typedef long gid_t; #endif /* __MINGW32__ */ -/* compatibility stuff for other compilers goes here */ - #ifndef _INTPTR_T_DEFINED typedef int intptr_t; # define _INTPTR_T_DEFINED diff --git a/win32/win32iop-o.h b/win32/win32iop-o.h index 6633f7a76b..2b766dc554 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 cbc9716e1f..caf87ae819 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 |