setres[ug]id, NORETURN

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 11 deletions

diff --git a/ruby.h b/ruby.h
index 9784fc65d2..de2bf3297c 100644
--- a/ruby.h
+++ b/ruby.h
@@ -64,9 +64,9 @@ extern "C" {
 #endif
 
 #ifdef HAVE_ATTR_NORETURN
-# define NORETURN __attribute__ ((noreturn))
-#else
-# define NORETURN
+# define NORETURN(x) x __attribute__ ((noreturn))
+#elif !defined NORETURN
+# define NORETURN(x) x
 #endif
 
 #if defined(HAVE_ALLOCA_H) && !defined(__GNUC__)
@@ -453,13 +453,13 @@ VALUE rb_equal _((VALUE,VALUE));
 
 EXTERN VALUE ruby_verbose, ruby_debug;
 
-void rb_raise __((VALUE, const char*, ...)) NORETURN;
-void rb_fatal __((const char*, ...)) NORETURN;
-void rb_bug __((const char*, ...)) NORETURN;
-void rb_sys_fail _((const char*)) NORETURN;
-void rb_iter_break _((void)) NORETURN;
-void rb_exit _((int)) NORETURN;
-void rb_notimplement _((void)) NORETURN;
+NORETURN(void rb_raise __((VALUE, const char*, ...)));
+NORETURN(void rb_fatal __((const char*, ...)));
+NORETURN(void rb_bug __((const char*, ...)));
+NORETURN(void rb_sys_fail _((const char*)));
+NORETURN(void rb_iter_break _((void)));
+NORETURN(void rb_exit _((int)));
+NORETURN(void rb_notimplement _((void)));
 
 void rb_warn __((const char*, ...));
 void rb_warning __((const char*, ...));		/* reports if `-w' specified */
@@ -472,7 +472,7 @@ VALUE rb_rescue _((VALUE(*)(),VALUE,VALUE(*)(),VALUE));
 VALUE rb_rescue2 __((VALUE(*)(),VALUE,VALUE(*)(),VALUE,...));
 VALUE rb_ensure _((VALUE(*)(),VALUE,VALUE(*)(),VALUE));
 VALUE rb_catch _((const char*,VALUE(*)(),VALUE));
-void rb_throw _((const char*,VALUE)) NORETURN;
+NORETURN(void rb_throw _((const char*,VALUE)));
 
 VALUE rb_require _((const char*));