diff --git a/ChangeLog b/ChangeLog
index 75a565165a..adf40ccc28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 30 00:52:56 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (config.h): define some constants to select
+	  collect code for win64.
+
 Thu Apr 29 20:10:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/test_open3.rb (test_commandline): use dump instead of
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index e3d8d5ade6..fa86472947 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -486,21 +486,37 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define HAVE_UINT8_T 1
 #define uint8_t unsigned char
 #define SIZEOF_INT8_T 1
+#define SIZEOF_UINT8_T 1
+#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
 #define HAVE_INTPTR_T 1
 #define HAVE_UINTPTR_T 1
 #define HAVE_SSIZE_T 1