yugui	2008-11-30 18:22:05 +0900 (Sun, 30 Nov 2008)

  New Revision: 20404

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20404

  Log:
    merges r20341 from trunk into ruby_1_9_1.
    * signal.c (register_sigaltstack): should not add external
      variable (with some cosmetic changes).  [ruby-dev:37158]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/signal.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20403)
+++ ruby_1_9_1/ChangeLog	(revision 20404)
@@ -1,3 +1,8 @@
+Mon Nov 24 23:16:32 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* signal.c (register_sigaltstack): should not add external
+	  variable (with some cosmetic changes).  [ruby-dev:37158]
+
 Mon Nov 24 22:57:25 2008  Shugo Maeda  <shugo@r...>
 
 	* strftime.c (rb_strftime): A width specifier for %t and %n should
Index: ruby_1_9_1/signal.c
===================================================================
--- ruby_1_9_1/signal.c	(revision 20403)
+++ ruby_1_9_1/signal.c	(revision 20404)
@@ -47,11 +47,6 @@
 # define NSIG (_SIGMAX + 1)      /* For QNX */
 #endif
 
-#if defined(SIGSEGV) && defined(HAVE_SIGALTSTACK)
-#define USE_SIGALTSTACK
-int is_altstack_defined = 0;
-#endif
-
 static const struct signals {
     const char *signm;
     int  signo;
@@ -415,6 +410,10 @@
 typedef RETSIGTYPE (*sighandler_t)(int);
 
 #ifdef POSIX_SIGNAL
+#if defined(SIGSEGV) && defined(HAVE_SIGALTSTACK)
+#define USE_SIGALTSTACK
+#endif
+
 #ifdef USE_SIGALTSTACK
 #ifdef SIGSTKSZ
 #define ALT_STACK_SIZE SIGSTKSZ
@@ -422,14 +421,17 @@
 #define ALT_STACK_SIZE (4*1024)
 #endif
 /* alternate stack for SIGSEGV */
-static void register_sigaltstack() {
+static void
+register_sigaltstack()
+{
+    static int is_altstack_defined = 0;
     stack_t newSS, oldSS;
 
-    if(is_altstack_defined)
+    if (is_altstack_defined)
       return;
 
     newSS.ss_sp = malloc(ALT_STACK_SIZE);
-    if(newSS.ss_sp == NULL)
+    if (newSS.ss_sp == NULL)
       /* should handle error */
        rb_bug("register_sigaltstack. malloc error\n");
     newSS.ss_size = ALT_STACK_SIZE;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/