summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--defines.h8
-rw-r--r--eval.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/defines.h b/defines.h
index 81ed18a..334be52 100644
--- a/defines.h
+++ b/defines.h
@@ -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 ";"
diff --git a/eval.c b/eval.c
index 5de75f9..171eadf 100644
--- a/eval.c
+++ b/eval.c
@@ -938,7 +938,7 @@ static void call_trace_func _((char*,NODE*,VALUE,ID,VALUE));
#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