From: Michal Rokos <michal@...>
Date: 2003-01-19T07:41:33+09:00
Subject: Wall ((void)0) - again

This is a multi-part message in MIME format.
--------------090302060305020101040307
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Hi Matz,

	I'm sorry that I screwed cleanup (I mean "squeeze 0's" part)...

	There is 1 more part that is not as I'd like to be... It's useless "do 
{ } while (0)" part instead of ((void)0)... [nobu pointed out this]

	Could you concider merge this?

		Michal

PS: My apologies once more!

--------------090302060305020101040307
Content-Type: text/plain;
 name="RubyWall2.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="RubyWall2.diff"

Index: defines.h
===================================================================
RCS file: /src/ruby/defines.h,v
retrieving revision 1.26
diff -u -p -r1.26 defines.h
--- defines.h	16 Jan 2003 07:38:39 -0000	1.26
+++ defines.h	16 Jan 2003 15:21:04 -0000
@@ -137,10 +137,10 @@ void xfree _((void*));
 #define EXTERN extern
 #endif
 
+#if defined(sparc) || defined(__sparc__)
 static inline void
 flush_register_windows(void)
 {
-#if defined(sparc) || defined(__sparc__)
 # if defined(__sparc_v9__) || defined(__arch64__)
     asm volatile ("flushw" : :);
 # elif defined(linux) || defined(__linux__)
@@ -148,9 +148,11 @@ flush_register_windows(void)
 # else /* Solaris, OpenBSD, NetBSD, etc. */
     asm volatile ("ta  0x03");
 # endif /* trap always to flush register windows if we are on a Sparc system */
-#endif 
 }
-#define FLUSH_REGISTER_WINDOWS	flush_register_windows()
+#  define FLUSH_REGISTER_WINDOWS flush_register_windows()
+#else
+#  define FLUSH_REGISTER_WINDOWS ((void)0)
+#endif 
 
 #if defined(DOSISH)
 #define PATH_SEP ";"
Index: eval.c
===================================================================
RCS file: /src/ruby/eval.c,v
retrieving revision 1.386
diff -u -p -r1.386 eval.c
--- eval.c	16 Jan 2003 07:38:39 -0000	1.386
+++ eval.c	16 Jan 2003 15:24:13 -0000
@@ -938,7 +938,7 @@ static void call_trace_func _((char*,NOD
 #define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \
 			      ruby_sourceline = nd_line(ruby_current_node))
 #else
-#define SET_CURRENT_SOURCE() do { } while (0)
+#define SET_CURRENT_SOURCE() ((void)0)
 #endif
 
 void

--------------090302060305020101040307--