summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-02 20:49:02 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-02 20:49:02 +0000
commitd20440ab6fae8590d7eeb0da5614b86e3eaa5228 (patch)
tree1e7b98a621036853ad6f6b2f4e028062915a36b4 /win32
parenta0ff5cae7c778e3c8b2b1e387c0c0163010d6c00 (diff)
* win32/Makefile.sub, symbian/setup (config.h): pack.c requires
SIZEOF_INT*_T now. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub11
1 files changed, 9 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 19aa5973ac..8f1d779207 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -481,21 +481,28 @@ $(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
#define int8_t signed char
#define HAVE_UINT8_T 1
#define uint8_t unsigned char
+#define SIZEOF_INT8_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 HAVE_INT32_T 1
#define int32_t int
#define HAVE_UINT32_T 1
#define uint32_t unsigned int
-#define HAVE_INT64_T HAVE_LONG_LONG
+#define SIZEOF_INT32_T 4
+!if $(MSC_VER) >= 1400
+#define HAVE_INT64_T 1
#define int64_t __int64
-#define HAVE_UINT64_T HAVE_LONG_LONG
+#define HAVE_UINT64_T 1
#define uint64_t unsigned __int64
+#define SIZEOF_INT64_T 8
+!endif
#define HAVE_INTPTR_T 1
#define HAVE_UINTPTR_T 1
#define HAVE_SSIZE_T 1