summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-19 08:28:12 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-19 08:28:12 +0000
commitd397d3b779df7f2295627e158c30021c02e02183 (patch)
tree78cab68cb42fa0fdaa874517f5f95d4d9f37f98b
parent05c21ceb96dfde4f5e718bdf2416d8b9c797cd82 (diff)
downloadruby-d397d3b779df7f2295627e158c30021c02e02183.tar.gz
ruby-d397d3b779df7f2295627e158c30021c02e02183.tar.xz
ruby-d397d3b779df7f2295627e158c30021c02e02183.zip
simplify previous change.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--eval.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/eval.c b/eval.c
index e614a0627..3ff37334a 100644
--- a/eval.c
+++ b/eval.c
@@ -138,14 +138,13 @@ rb_jump_context(env, val)
(__GNUC__ == (major) && __GNUC_MINOR__ < (minor)) || \
(__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ < (patchlevel))))
#if GCC_VERSION_BEFORE(4,0,3)
-#if defined (__GNUC__) && (defined(sparc) || defined(__sparc__))
+#if defined(sparc) || defined(__sparc__)
#define FUNCTION_CALL_MAY_RETURN_TWICE \
({ __asm__ volatile ("" : : : \
"%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
"%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", "%l7", \
"%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
-#else
-#if defined(__ia64__)
+#elif defined(__ia64__)
static jmp_buf function_call_may_return_twice_jmp_buf;
int function_call_may_return_twice_false = 0;
#define FUNCTION_CALL_MAY_RETURN_TWICE \
@@ -155,7 +154,6 @@ int function_call_may_return_twice_false = 0;
#else
#define FUNCTION_CALL_MAY_RETURN_TWICE 0
#endif
-#endif
#else
#define FUNCTION_CALL_MAY_RETURN_TWICE 0
#endif