* various files: macro fix-up by Michal Rokos.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 9 deletions

diff --git a/class.c b/class.c
index 485653517..1ead9b002 100644
--- a/class.c
+++ b/class.c
@@ -661,19 +661,23 @@ rb_undef_method(klass, name)
 
 #if 0
 
-#define SPECIAL_SINGLETON(x,c) if (obj == (x)) {\
-    if (!FL_TEST(c, FL_SINGLETON)) {\
-	c = rb_singleton_class_new(c);\
-	rb_singleton_class_attached(c,obj);\
+#define SPECIAL_SINGLETON(x,c) do {
+    if (obj == (x)) {\
+	if (!FL_TEST(c, FL_SINGLETON)) {\
+	    c = rb_singleton_class_new(c);\
+	    rb_singleton_class_attached(c,obj);\
+	}\
+	return c;\
     }\
-    return c;\
-}
+} while (0)
 
 #else
 
-#define SPECIAL_SINGLETON(x,c) if (obj == (x)) {\
-    return c;\
-}
+#define SPECIAL_SINGLETON(x,c) do {\
+    if (obj == (x)) {\
+	return c;\
+    }\
+} while (0)
 
 #endif