summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-05-18 12:19:05 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-05-18 12:19:05 +0000
commit62f83f9f13164cb2bfca7e18977620f649365e43 (patch)
tree55d4e564cabb72888d95a0911c4941ba5ebf72f4
parent7ee0812aee77599f963379040aea38052080e76c (diff)
* win32/Makefile.sub (config.h): add VC++4/5 support about noreturn
directive. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/Makefile.sub4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 71f4a7c5f21..75ad0fcb77a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 18 21:18:00 2002 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub (config.h): add VC++4/5 support about noreturn
+ directive.
+
Fri May 17 16:16:19 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* sampl/test.rb: use eval instead of './miniruby -c',
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 2650d82eb3a..03422778cba 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -182,7 +182,11 @@ config.h: Makefile $(srcdir)/win32/Makefile.sub
#define HAVE_PROTOTYPES 1
#define TOKEN_PASTE(x,y) x##y
#define HAVE_STDARG_PROTOTYPES 1
+#if _MSC_VER > 1100 && !defined NORETURN
#define NORETURN(x) __declspec(noreturn) x
+#else
+#define NORETURN(x) x
+#endif
#define HAVE_DECL_SYS_NERR 1
#define STDC_HEADERS 1
#define HAVE_STDLIB_H 1