diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2012-06-09 11:57:58 +0100 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2012-06-09 17:58:53 +0100 |
| commit | 3090e57a7623df3083462032f942f4bb64d46921 (patch) | |
| tree | a5d649599f5f17b9f65e0927150257a74cdd0bae /win32/config_H.gc | |
| parent | c716620072a2a924157c74219f6e6a9b5c3a8d46 (diff) | |
| download | perl-3090e57a7623df3083462032f942f4bb64d46921.tar.gz | |
Remove __GNUC__ / _MSC_VER games from win32/config_H.*
The code was added by 465b7da985, based on changes in ActivePerl 816, but
it's not working correctly because the current build process winds up with
a config.h in lib/CORE which doesn't contain that code anyway.
(The appropriate canned config_H.* file is copied to config.h in order to
build miniperl.exe, but then miniperl.exe is used to run config_h.PL to
generate the real config.h from config_h.SH and config.sh. The real
config.h is then used to build perl.exe and is what gets copied into
lib/CORE for later use when building extensions, but it doesn't contain
the support for other compilers because that isn't in config_h.SH...)
Removing the code won't affect ActivePerl since it has not been getting
installed anyway, and Jan Dubois has confirmed that it is possible to
build a Perl extension using e.g. Off_t with MinGW even with the VC
config.h header file. Furthermore, anyone building perl from source
themselves will presumably be able to use the same compiler to build
extensions as they used to build perl itself anyway, so there is no
obvious need for this in the core perl distro.
Therefore, removing it rather than fixing it is better for simplicity.
Diffstat (limited to 'win32/config_H.gc')
| -rw-r--r-- | win32/config_H.gc | 49 |
1 files changed, 11 insertions, 38 deletions
diff --git a/win32/config_H.gc b/win32/config_H.gc index fce9e21f72..846a296358 100644 --- a/win32/config_H.gc +++ b/win32/config_H.gc @@ -912,15 +912,9 @@ */ #define HAS_QUAD /**/ #ifdef HAS_QUAD -# ifndef _MSC_VER -# define Quad_t long long /**/ -# define Uquad_t unsigned long long /**/ -# define QUADKIND 3 /**/ -# else -# define Quad_t __int64 /**/ -# define Uquad_t unsigned __int64 /**/ -# define QUADKIND 5 /**/ -# endif +# define Quad_t long long /**/ +# define Uquad_t unsigned long long /**/ +# define QUADKIND 3 /**/ # define QUAD_IS_INT 1 # define QUAD_IS_LONG 2 # define QUAD_IS_LONG_LONG 3 @@ -1063,9 +1057,7 @@ * This symbol is defined if the C compiler can cast negative * or large floating point numbers to 32-bit ints. */ -#ifndef _MSC_VER -# define CASTI32 /**/ -#endif +#define CASTI32 /**/ /* CASTNEGFLOAT: * This symbol is defined if the C compiler can cast negative @@ -2237,11 +2229,7 @@ * static (c89 compilers) */ #define HAS_STATIC_INLINE /**/ -#ifndef _MSC_VER -# define PERL_STATIC_INLINE static __inline__ /**/ -#else -# define PERL_STATIC_INLINE static __inline /**/ -#endif +#define PERL_STATIC_INLINE static __inline__ /**/ /* EBCDIC: * This symbol, if defined, indicates that this system uses @@ -2310,15 +2298,9 @@ * This symbol is intended to be used along with CPPRUN in the same manner * symbol CPPMINUS is used with CPPSTDIN. It contains either "-" or "". */ -#ifndef _MSC_VER -# define CPPSTDIN "gcc -E" -# define CPPMINUS "-" -# define CPPRUN "gcc -E" -#else -# define CPPSTDIN "cppstdin" -# define CPPMINUS "" -# define CPPRUN "cl -nologo -E" -#endif +#define CPPSTDIN "gcc -E" +#define CPPMINUS "-" +#define CPPRUN "gcc -E" #define CPPLAST "" /* HAS_ACCESS: @@ -2612,11 +2594,7 @@ */ #define HAS_LONG_DOUBLE /**/ #ifdef HAS_LONG_DOUBLE -# ifndef _MSC_VER -# define LONG_DOUBLESIZE 12 /**/ -# else -# define LONG_DOUBLESIZE 8 /**/ -# endif +# define LONG_DOUBLESIZE 12 /**/ #endif /* HAS_LONG_LONG: @@ -4299,13 +4277,8 @@ #define I32TYPE long /**/ #define U32TYPE unsigned long /**/ #ifdef HAS_QUAD -# ifndef _MSC_VER -# define I64TYPE long long /**/ -# define U64TYPE unsigned long long /**/ -# else -# define I64TYPE __int64 /**/ -# define U64TYPE unsigned __int64 /**/ -# endif +#define I64TYPE long long /**/ +#define U64TYPE unsigned long long /**/ #endif #define NVTYPE double /**/ #define IVSIZE 4 /**/ |