From 75b3678972873c46dca67ee5f017dbebcfe08f10 Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 11 Jan 2001 01:56:08 +0000
Subject: NORETURN, INLINE

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/config.h.in | 6 ++++--
 win32/win32.h     | 4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'win32')

diff --git a/win32/config.h.in b/win32/config.h.in
index 6bffe7eea..0f017e9ac 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 b6824528d..ebffc5c8a 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
 //
-- 
cgit