summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-14 01:47:02 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-14 01:47:02 +0000
commit668af7e99d8458e3033d3641b25656ab8401ad74 (patch)
tree50f6949c02dfd7433ca503e2bdaa516dd4903836 /win32
parent4b31c84daedaeb6ae802e30c1652a5546f977ac0 (diff)
* configure.in (int8_t, uint8_t, int16_t, uint16_t int32_t,
uint32_t int64_t, uint64_t, int128_t, uint128_t, intptr_t, uintptr_t): check if defined. * win32/Makefile.sub: follow configure.in. * ext/digest/defs.h: remove checks for uint8_t, uint32_t and uint64_t. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub25
1 files changed, 25 insertions, 0 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 3f66fc08c6..cb06fecbc3 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -368,6 +368,31 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define uint32_t unsigned int
#define HAVE_STRUCT_STAT_ST_RDEV 1
#define HAVE_ST_RDEV 1
+#define int8_t signed char
+#define HAVE_UINT8_T 1
+#define uint8_t unsigned char
+#define HAVE_INT16_T 1
+#define int16_t short
+#define HAVE_UINT16_T 1
+#define uint16_t unsigned short
+#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 int64_t __int64
+#define HAVE_UINT64_T HAVE_LONG_LONG
+#define uint64_t unsigned __int64
+#define HAVE_INTPTR_T 1
+#define HAVE_UINTPTR_T 1
+!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64"
+#define intptr_t __int64
+#define uintptr_t unsigned __int64
+!else
+#define intptr_t long
+#define uintptr_t unsigned long
+!endif
+#endif
#define GETGROUPS_T int
#define RETSIGTYPE void
!if !defined(WIN32_WCE)