From c6c0e6f26bce5ea20243c493ae53b90314b7804b Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 19 Dec 2005 08:28:12 +0000 Subject: [PATCH] simplify previous change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- eval.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eval.c b/eval.c index e614a06272..3ff37334a5 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