Changeset a4da45e for libcfa/src/bits/signal.hfa

Timestamp:

Feb 26, 2024, 3:53:42 AM (20 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

3f9a8d0

Parents:

0522ebe (diff), 022bce0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• libcfa/src/bits/signal.hfa (modified) (2 diffs)

libcfa/src/bits/signal.hfa

@@ -34 +34 @@
         act.sa_sigaction = (void (*)(int, siginfo_t *, void *))handler;
         sigemptyset( &act.sa_mask );
-        sigaddset( &act.sa_mask, SIGALRM );             // disabled during signal handler
+        sigaddset( &act.sa_mask, SIGALRM );                                     // disabled during signal handler
         sigaddset( &act.sa_mask, SIGUSR1 );
         sigaddset( &act.sa_mask, SIGSEGV );
@@ -40 +40 @@
         sigaddset( &act.sa_mask, SIGILL );
         sigaddset( &act.sa_mask, SIGFPE );
-        sigaddset( &act.sa_mask, SIGHUP );              // revert to default on second delivery
+        sigaddset( &act.sa_mask, SIGHUP );                                      // revert to default on second delivery
         sigaddset( &act.sa_mask, SIGTERM );
         sigaddset( &act.sa_mask, SIGINT );