Changeset 454 for trunk/server/source3/lib/fault.c

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

File:

• trunk/server/source3/lib/fault.c (modified) (4 diffs)

trunk/server/source3/lib/fault.c

@@ -54 +54 @@
         if (cont_fn) {
                 cont_fn(NULL);
+#ifndef __OS2__ /* don't use the built in signal capture stuff - prefer native handling of errors */
 #ifdef SIGSEGV
                 CatchSignal(SIGSEGV,SIGNAL_CAST SIG_DFL);
@@ -62 +63 @@
 #ifdef SIGABRT
                 CatchSignal(SIGABRT,SIGNAL_CAST SIG_DFL);
+#endif
 #endif
                 return; /* this should cause a core dump */
@@ -83 +85 @@
         cont_fn = fn;
 
+#ifndef __OS2__ /* don't use the built in signal capture stuff - prefer native handling of errors */
 #ifdef SIGSEGV
         CatchSignal(SIGSEGV,SIGNAL_CAST sig_fault);
@@ -91 +94 @@
 #ifdef SIGABRT
         CatchSignal(SIGABRT,SIGNAL_CAST sig_fault);
+#endif
 #endif
 }