diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 | ||||
| -rw-r--r-- | wince/Makefile.sub | 4 |
3 files changed, 7 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Tue Mar 2 12:32:59 2004 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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 <dave@pragprog.com> * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_alias): diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c40f2bb389..f3d3cffd2d 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 5ad5154d67..8954334b2a 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 |