[Cmake-commits] CMake branch, next, updated. v3.0.0-4390-g4ceee50

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4ceee50e1d51f8bea1a6f76ec267712457a39b02 (commit)
       via  cc3248f45231d24061bbc88fa6dd66897162cb3a (commit)
      from  154cfe3c03b0c52bdc5ca15054b78567e1d98152 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ceee50e1d51f8bea1a6f76ec267712457a39b02
commit 4ceee50e1d51f8bea1a6f76ec267712457a39b02
Merge: 154cfe3 cc3248f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 21 10:49:55 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 21 10:49:55 2014 -0400

    Merge topic 'backport-kwsys-qnx-fix' into next
    
    cc3248f4 KWSys SystemInformation: No SA_RESTART on QNX


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc3248f45231d24061bbc88fa6dd66897162cb3a
commit cc3248f45231d24061bbc88fa6dd66897162cb3a
Author:     Bob E <ebobbob at gmail.com>
AuthorDate: Thu Jul 17 06:23:00 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 17 09:51:48 2014 -0400

    KWSys SystemInformation: No SA_RESTART on QNX
    
    QNX not support SA_RESTART signal:
    
     /* #define SA_RESTART 0x0040 (not supported yet) */
    
    Use it in SystemInformation only if it is defined.

diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index ec3a133..a03b39c 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -3696,7 +3696,10 @@ void SystemInformationImplementation::SetStackTraceOnError(int enable)
     // install ours
     struct sigaction sa;
     sa.sa_sigaction=(SigAction)StacktraceSignalHandler;
-    sa.sa_flags=SA_SIGINFO|SA_RESTART|SA_RESETHAND;
+    sa.sa_flags=SA_SIGINFO|SA_RESETHAND;
+# ifdef SA_RESTART
+    sa.sa_flags|=SA_RESTART;
+# endif
     sigemptyset(&sa.sa_mask);
 
     sigaction(SIGABRT,&sa,0);

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake