summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-02 03:31:05 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-02 03:31:05 +0000
commit6d59bf215708a542ac637747bf906bd22575843f (patch)
treeb38e44bd85a3496f1d11b98db3ed7edc314ce218
parent1b721aa420dbf9c5ab505d5d63bbb011211cba3a (diff)
downloadruby-6d59bf215708a542ac637747bf906bd22575843f.tar.gz
ruby-6d59bf215708a542ac637747bf906bd22575843f.tar.xz
ruby-6d59bf215708a542ac637747bf906bd22575843f.zip
* wince/Makefile.sub (config.h): shouldn't check defined? NORETURN.
[ruby-dev:23100] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--wince/Makefile.sub4
2 files changed, 3 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e806485ff..6d260351e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
Tue Mar 2 12:24:03 2004 NAKAMURA Usaku <usa@ruby-lang.org>
- * win32/Makefile.sub (config.h): shouldn't check defined? NORETURN.
- [ruby-dev:23100]
+ * win32/Makefile.sub, wince/Makefile.sub (config.h): shouldn't check
+ defined? NORETURN. [ruby-dev:23100]
Tue Mar 2 11:28:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 7eeed4bfd..173892096 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -234,10 +234,8 @@ config.h:
#define HAVE_PROTOTYPES 1
#define TOKEN_PASTE(x,y) x##y
#define HAVE_STDARG_PROTOTYPES 1
-#if _MSC_VER > 1100 && !defined NORETURN
+#if _MSC_VER > 1100
#define NORETURN(x) __declspec(noreturn) x
-#else
-#define NORETURN(x) x
#endif
#define HAVE_DECL_SYS_NERR 1
#define HAVE_FCNTL_H 1