diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-03 04:42:33 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-03 04:42:33 +0000 |
| commit | d838b0d0436a2a111f30960ecb7deaa5f87693d1 (patch) | |
| tree | 99a314677f86d29405e6aa99baae570b61fae3f7 /win32 | |
| parent | 0b217230ea96ef3d15c0c55e3c2e5b9aca275490 (diff) | |
merge revision(s) 33556:
* win32/Makefile.sub (CONFIG_H): have stdint.h if VC2010.
[Bug #5243]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 42 |
1 files changed, 23 insertions, 19 deletions
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 |