summaryrefslogtreecommitdiffstats
path: root/win32
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-01 00:42:06 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-01 00:42:06 +0000
commit3de0c7cd779061c97d9f4f7546109315e20f2e65 (patch)
treebcbd94364884def462f52becc6541623826e7dc2 /win32
parent7c5effe22eb9c90bb0a779697dee730b51aff937 (diff)
downloadruby-3de0c7cd779061c97d9f4f7546109315e20f2e65.tar.gz
ruby-3de0c7cd779061c97d9f4f7546109315e20f2e65.tar.xz
ruby-3de0c7cd779061c97d9f4f7546109315e20f2e65.zip
* {bcc,win}32/Makefile (config.h): need to define RUBY_SETJMP, etc.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub5
1 files changed, 4 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 61d6afc6f..7fd552fc0 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -385,7 +385,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define HAVE_INTPTR_T 1
#define HAVE_UINTPTR_T 1
#define HAVE_SSIZE_T 1
-!if "$(ARCH)" == "AMD64" || "$(ARCH)" == "IA64"
+!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64"
#define ssize_t __int64
!else
#define ssize_t int
@@ -442,6 +442,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define RSHIFT(x,y) ((x)>>(int)y)
#define FILE_COUNT _cnt
#define FILE_READPTR _ptr
+#define RUBY_SETJMP(env) _setjmp(env)
+#define RUBY_LONGJMP(env,val) longjmp(env,val)
+#define RUBY_JMP_BUF jmp_buf
#define inline __inline
#define NEED_IO_SEEK_BETWEEN_RW 1
!if "$(PROCESSOR_ARCHITECTURE)" == "x86" || "$(ARCH)" == "x64" || "$(ARCH)" == "ia64"