From da605777f1e55fc97ddafe7336b8b7453a8dbd18 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 2 Mar 2004 03:33:49 +0000 Subject: * win32/Makefile.sub, wince/Makefile.sub (config.h): shouldn't check defined? NORETURN. [ruby-dev:23100] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/Makefile.sub | 4 +--- wince/Makefile.sub | 4 +--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79fb52555..9a1895e8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 2 12:32:59 2004 NAKAMURA Usaku + + * win32/Makefile.sub, wince/Makefile.sub (config.h): shouldn't check + defined? NORETURN. [ruby-dev:23100] + Mon Mar 1 12:24:10 2004 Dave Thomas * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_alias): diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c40f2bb38..f3d3cffd2 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -220,10 +220,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_LIMITS_H 1 diff --git a/wince/Makefile.sub b/wince/Makefile.sub index 5ad5154d6..8954334b2 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 -- cgit