Crossport lib/svec.[ch] from master branch.

[sliver-openvswitch.git] / lib / fatal-signal.c

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index 99b9d5e..35a37bf 100644 (file)
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -108,11 +108,11 @@ fatal_signal_block()
 
             sigaddset(&fatal_signal_set, sig_nr);
             if (sigaction(sig_nr, NULL, &old_sa)) {
-                fatal(errno, "sigaction");
+                ofp_fatal(errno, "sigaction");
             }
             if (old_sa.sa_handler == SIG_DFL
                 && signal(sig_nr, fatal_signal_handler) == SIG_ERR) {
-                fatal(errno, "signal");
+                ofp_fatal(errno, "signal");
             }
         }
         atexit(atexit_handler);
@@ -167,7 +167,7 @@ atexit_handler(void)
 static void
 call_hooks(int sig_nr)
 {
-    volatile sig_atomic_t recurse = 0;
+    static volatile sig_atomic_t recurse = 0;
     if (!recurse) {
         size_t i;