[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-988-g1e9cfc0

[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  1e9cfc0f22edb7df06dc6059cecb712b06c063a1 (commit)
       via  e166203f31890e5bbe2bfa19bd5eb63e7d8c3b90 (commit)
      from  4752866b6d3a4543572a9b150571d623e24efd4a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e9cfc0f22edb7df06dc6059cecb712b06c063a1
commit 1e9cfc0f22edb7df06dc6059cecb712b06c063a1
Merge: 4752866 e166203
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 26 13:22:21 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 26 13:22:21 2015 -0400

    Merge topic 'fix-C-comment-syntax' into next
    
    e166203f CheckForPthreads.c: Do not use C++-style comments in C source


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e166203f31890e5bbe2bfa19bd5eb63e7d8c3b90
commit e166203f31890e5bbe2bfa19bd5eb63e7d8c3b90
Author:     Marc Chevrier <marc.chevrier at sap.com>
AuthorDate: Mon Oct 26 14:17:44 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 26 13:21:59 2015 -0400

    CheckForPthreads.c: Do not use C++-style comments in C source

diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c
index 2732957..344c81b 100644
--- a/Modules/CheckForPthreads.c
+++ b/Modules/CheckForPthreads.c
@@ -16,8 +16,8 @@ int main(int ac, char*av[]){
   pthread_create(&tid[0], 0, runner, (void*)1);
   pthread_create(&tid[1], 0, runner, (void*)2);
 
-#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.)
-  usleep(1); // for strange behavior on single-processor sun
+#if defined(__BEOS__) && !defined(__ZETA__) /* (no usleep on BeOS 5.) */
+  usleep(1); /* for strange behavior on single-processor sun */
 #endif
 
   pthread_join(tid[0], 0);

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

Summary of changes:
 Modules/CheckForPthreads.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake