diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 42 |
3 files changed, 29 insertions, 20 deletions
@@ -1,3 +1,8 @@ +Mon Jan 2 23:41:57 2012 Tajima Akil <artonx@yahoo.co.jp> + + * win32/Makefile.sub (CONFIG_H): have stdint.h if VC2010. + [Bug #5243] + Mon Jan 2 21:40:45 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * tool/merger.rb (#version_up): version.h date should be Japanese @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 14 +#define RUBY_PATCHLEVEL 15 #define RUBY_RELEASE_DATE "2012-01-03" #define RUBY_RELEASE_YEAR 2012 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 4167f6a95b..3733dc8a47 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 INT16_MIN _I16_MIN +#define INT16_MAX _I16_MAX +#define UINT16_MAX _UI16_MAX +#define INT32_MIN _I32_MIN +#define INT32_MAX _I32_MAX +#define UINT32_MAX _UI32_MAX +#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 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 #define HAVE_INTPTR_T 1 #define HAVE_UINTPTR_T 1 #define HAVE_SSIZE_T 1 |