From 3de0c7cd779061c97d9f4f7546109315e20f2e65 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 1 Apr 2008 00:42:06 +0000
Subject: 	* {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
---
 ChangeLog          | 4 ++++
 bcc32/Makefile.sub | 3 +++
 win32/Makefile.sub | 5 ++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 16f589465..3dba7c381 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Apr  1 09:41:22 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* {bcc,win}32/Makefile (config.h): need to define RUBY_SETJMP, etc.
+
 Tue Apr  1 07:31:58 2008  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems* test/rubygems*: Import RubyGems 1.1.0.
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index f46d5cd65..9c357cc1c 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -342,6 +342,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
 \#define RSHIFT(x,y) ((x)>>(int)y)
 \#define FILE_COUNT level
 \#define FILE_READPTR curp
+\#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
 \#define STACK_GROW_DIRECTION -1
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"
-- 
cgit