summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-01-11 01:56:08 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-01-11 01:56:08 +0000
commit6ee84cbabe8fe433930631b15eda4460ffbf2561 (patch)
tree0743890a460d551f910559c5f593f95e1a29d456
parent8bbfa6fa4c548f1a02e58e8b4dfbb444c0c87d8c (diff)
NORETURN, INLINE
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--win32/config.h.in6
-rw-r--r--win32/win32.h4
3 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 008aa2f..711cf49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jan 11 10:45:04 2001 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * win32/win32.h, win32/config.h.in: move NORETURN from win32.h
+ to config.h.in.
+
+ * win32/config.h.in (inline): renamed from INLINE.
+
+ * djgpp/config.hin (INLINE): removed.
+
Wed Jan 10 16:15:08 2001 WATANABE Hirofumi <eban@ruby-lang.org>
* ruby.h: NORETURN macro is changed for VC++ 6.0.
diff --git a/win32/config.h.in b/win32/config.h.in
index 6bffe7e..0f017e9 100644
--- a/win32/config.h.in
+++ b/win32/config.h.in
@@ -1,8 +1,10 @@
#define HAVE_PROTOTYPES 1
#define HAVE_STDARG_PROTOTYPES 1
/* #define HAVE_ATTR_NORETURN 1 */
-#define HAVE_INLINE 1
-#define INLINE __inline
+#if _MSC_VER > 1100 && !defined NORETURN
+#define NORETURN(x) __declspec(noreturn) x
+#endif
+#define inline __inline
/* #define HAVE_DIRENT_H 1 */
/* #define HAVE_UNISTD_H 1 */
#define HAVE_STDLIB_H 1
diff --git a/win32/win32.h b/win32/win32.h
index b682452..ebffc5c 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -16,10 +16,6 @@
#define EXTERN extern __declspec(dllexport)
#endif
-#if defined _MSC_VER && !defined NORETURN
-#define NORETURN(x) __declspec(noreturn) x
-#endif
-
//
// Definitions for NT port of Perl
//