ruby-changes:35956
From: nobu <ko1@a...>
Date: Mon, 20 Oct 2014 02:34:21 +0900 (JST)
Subject: [ruby-changes:35956] nobu:r48037 (trunk): signal.c: adjust indent of preprocessing directives
nobu 2014-10-20 02:34:09 +0900 (Mon, 20 Oct 2014) New Revision: 48037 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48037 Log: signal.c: adjust indent of preprocessing directives Modified files: trunk/signal.c Index: signal.c =================================================================== --- signal.c (revision 48036) +++ signal.c (revision 48037) @@ -731,13 +731,13 @@ rb_get_next_signal(void) https://github.com/ruby/ruby/blob/trunk/signal.c#L731 #if defined(USE_SIGALTSTACK) || defined(_WIN32) NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th)); -#if !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__)) -#elif defined __linux__ -# define USE_UCONTEXT_REG 1 -#elif defined __APPLE__ -# define USE_UCONTEXT_REG 1 -#endif -#ifdef USE_UCONTEXT_REG +# if !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__)) +# elif defined __linux__ +# define USE_UCONTEXT_REG 1 +# elif defined __APPLE__ +# define USE_UCONTEXT_REG 1 +# endif +# ifdef USE_UCONTEXT_REG static void check_stack_overflow(const uintptr_t addr, const ucontext_t *ctx) { @@ -773,7 +773,7 @@ check_stack_overflow(const uintptr_t add https://github.com/ruby/ruby/blob/trunk/signal.c#L773 ruby_thread_stack_overflow(th); } } -#else +# else static void check_stack_overflow(const void *addr) { @@ -783,23 +783,23 @@ check_stack_overflow(const void *addr) https://github.com/ruby/ruby/blob/trunk/signal.c#L783 ruby_thread_stack_overflow(th); } } -#endif -#ifdef _WIN32 -#define CHECK_STACK_OVERFLOW() check_stack_overflow(0) -#else -#define FAULT_ADDRESS info->si_addr -# ifdef USE_UCONTEXT_REG -# define CHECK_STACK_OVERFLOW() check_stack_overflow((uintptr_t)FAULT_ADDRESS, ctx) -#else -# define CHECK_STACK_OVERFLOW() check_stack_overflow(FAULT_ADDRESS) -#endif -#define MESSAGE_FAULT_ADDRESS " at %p", FAULT_ADDRESS -#endif +# endif +# ifdef _WIN32 +# define CHECK_STACK_OVERFLOW() check_stack_overflow(0) +# else +# define FAULT_ADDRESS info->si_addr +# ifdef USE_UCONTEXT_REG +# define CHECK_STACK_OVERFLOW() check_stack_overflow((uintptr_t)FAULT_ADDRESS, ctx) +# else +# define CHECK_STACK_OVERFLOW() check_stack_overflow(FAULT_ADDRESS) +# endif +# define MESSAGE_FAULT_ADDRESS " at %p", FAULT_ADDRESS +# endif #else -#define CHECK_STACK_OVERFLOW() (void)0 +# define CHECK_STACK_OVERFLOW() (void)0 #endif #ifndef MESSAGE_FAULT_ADDRESS -#define MESSAGE_FAULT_ADDRESS +# define MESSAGE_FAULT_ADDRESS #endif #if defined SIGSEGV || defined SIGBUS || defined SIGILL || defined SIGFPE -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/