NORETURN, INLINE

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
lann · Jan 11, 2001 · 6ee84cb · 6ee84cb
1 parent 8bbfa6f
commit 6ee84cb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jan 11 10:45:04 2001  WATANABE Hirofumi  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* ruby.h: NORETURN macro is changed for VC++ 6.0.

diff --git 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
@@ -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
 //