From 195fbd18d61c336b510f63ea83dbf6483523aee2 Mon Sep 17 00:00:00 2001 From: arton Date: Sat, 29 Oct 2011 12:08:47 +0000 Subject: [PATCH] * win32/Makefile.sub (CONFIG_H): have stdint.h if VC2010. [Bug #5243] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/Makefile.sub | 48 +++++++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1cf0c714c..d4eaa0a2ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Oct 20 21:08:18 2011 Tajima Akil + + * win32/Makefile.sub (CONFIG_H): have stdint.h if VC2010. + [Bug #5243] + Sat Oct 29 20:59:08 2011 Tanaka Akira * io.c (rb_cloexec_dup): use F_DUPFD_CLOEXEC if available. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index abd9e6f16e..2441b8d140 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -540,42 +540,46 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define rb_uid_t int #define HAVE_STRUCT_STAT_ST_RDEV 1 #define HAVE_ST_RDEV 1 -#define HAVE_INT8_T 1 +!if $(MSC_VER) >= 1600 +#define HAVE_STDINT_H 1 +!else #define int8_t signed char -#define HAVE_UINT8_T 1 #define uint8_t unsigned char -#define SIZEOF_INT8_T 1 -#define SIZEOF_UINT8_T 1 +#define int16_t short +#define uint16_t unsigned short +#define int32_t int +#define uint32_t unsigned int +#define int64_t __int64 +#define uint64_t unsigned __int64 #define INT8_MIN _I8_MIN #define INT8_MAX _I8_MAX #define UINT8_MAX _UI8_MAX -#define HAVE_INT16_T 1 -#define int16_t short -#define HAVE_UINT16_T 1 -#define uint16_t unsigned short -#define SIZEOF_INT16_T 2 -#define SIZEOF_UINT16_T 2 #define INT16_MIN _I16_MIN #define INT16_MAX _I16_MAX #define UINT16_MAX _UI16_MAX -#define HAVE_INT32_T 1 -#define int32_t int -#define HAVE_UINT32_T 1 -#define uint32_t unsigned int -#define SIZEOF_INT32_T 4 -#define SIZEOF_UINT32_T 4 #define INT32_MIN _I32_MIN #define INT32_MAX _I32_MAX #define UINT32_MAX _UI32_MAX -#define HAVE_INT64_T 1 -#define int64_t __int64 -#define HAVE_UINT64_T 1 -#define uint64_t unsigned __int64 -#define SIZEOF_INT64_T 8 -#define SIZEOF_UINT64_T 8 #define INT64_MIN _I64_MIN #define INT64_MAX _I64_MAX #define UINT64_MAX _UI64_MAX +!endif +#define HAVE_INT8_T 1 +#define HAVE_UINT8_T 1 +#define SIZEOF_INT8_T 1 +#define SIZEOF_UINT8_T 1 +#define HAVE_INT16_T 1 +#define HAVE_UINT16_T 1 +#define SIZEOF_INT16_T 2 +#define SIZEOF_UINT16_T 2 +#define HAVE_INT32_T 1 +#define HAVE_UINT32_T 1 +#define SIZEOF_INT32_T 4 +#define SIZEOF_UINT32_T 4 +#define HAVE_INT64_T 1 +#define HAVE_UINT64_T 1 +#define SIZEOF_INT64_T 8 +#define SIZEOF_UINT64_T 8 #define HAVE_INTPTR_T 1 #define HAVE_UINTPTR_T 1 #define HAVE_SSIZE_T 1