diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-02 03:26:09 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-02 03:26:09 +0000 |
| commit | 8e89487675db2e7ac66f1415d20ca51968a47295 (patch) | |
| tree | 08afcde4c452ea342aa5103d2a829868512326d2 | |
| parent | 06953dceed879bba1b2c31ae3a994cb872402cd4 (diff) | |
* win32/Makefile.sub (config.h): shouldn't check defined? NORETURN.
[ruby-dev:23100]
* ChangeLog: typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 |
2 files changed, 8 insertions, 5 deletions
@@ -1,3 +1,8 @@ +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] + Tue Mar 2 11:28:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/ruby/test_iterator.rb (test_ljump): cannot use @@ -5,7 +10,7 @@ Tue Mar 2 11:28:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Mar 2 06:23:14 2004 David Black <dblack@wobblini.net> - * Fixed Kernel#scanf to propagate code block + * Fixed Kernel#scanf to propagate code block Mon Mar 1 23:25:40 2004 David Black <dblack@wobblini.net> @@ -33,7 +38,7 @@ Sat Feb 28 21:50:20 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * bcc32/Makefile.sub, bcc32/README.bcc32, bcc32/configure.bat, bcc32/setup.mak: new configure scheme. use ``configure --prefix=dir'' instead of ``make DESTDIR=dir install''. - --with-static-linked-ext support on mswin32. [ruby-dev:23034] + --with-static-linked-ext support on bccwin32. [ruby-dev:23034] (by Nakada. Thanks.) * bcc32/setup.mak: "configure --disable-install-doc" is now working. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 0490003c79..ea3d0512f9 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -244,10 +244,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 |