[Cmake-commits] CMake branch, next, updated. v3.6.2-2031-g722a08d

[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  722a08d1e829205e8ee91f7c5c9983eac047d0d5 (commit)
       via  d4d0c9422695e3ba67d933566c69034ed814d9ea (commit)
      from  d0cd09fd67005deb08f59b7ecc5276ea373afca8 (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=722a08d1e829205e8ee91f7c5c9983eac047d0d5
commit 722a08d1e829205e8ee91f7c5c9983eac047d0d5
Merge: d0cd09f d4d0c94
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 10:51:53 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 14 10:51:53 2016 -0400

    Merge topic 'fix-ccmake-sun-gcc' into next
    
    d4d0c942 ccmake: Fix recent compilation regression with GCC on Solaris


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4d0c9422695e3ba67d933566c69034ed814d9ea
commit d4d0c9422695e3ba67d933566c69034ed814d9ea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 14 10:48:51 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 14 10:51:27 2016 -0400

    ccmake: Fix recent compilation regression with GCC on Solaris
    
    The change in commit 32f756c8 (CursesDialog: include what you use,
    2016-09-01) revealed that an ancient workaround for compiling with GCC
    on Solaris has not had an effect in a long time and is now incorrect.
    Drop it.

diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
index 4929958..1d8d7c6 100644
--- a/Source/CursesDialog/cmCursesStandardIncludes.h
+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
@@ -14,10 +14,6 @@
 
 #include <cmConfigure.h>
 
-#if defined(__sun__) && defined(__GNUC__)
-#define _MSE_INT_H
-#endif
-
 #if defined(__hpux)
 #define _BOOL_DEFINED
 #include <sys/time.h>
diff --git a/Source/CursesDialog/form/form.h b/Source/CursesDialog/form/form.h
index 1219cb5..b65a3ca 100644
--- a/Source/CursesDialog/form/form.h
+++ b/Source/CursesDialog/form/form.h
@@ -33,10 +33,6 @@
 #ifndef FORM_H
 #define FORM_H
 
-#if defined(__sun__) && defined(__GNUC__)
- #define _MSE_INT_H
-#endif
-
 #include <cmFormConfigure.h>
 
 /* figure out which curses.h to include */

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

Summary of changes:
 Source/CursesDialog/cmCursesStandardIncludes.h |    4 ----
 Source/CursesDialog/form/form.h                |    4 ----
 2 files changed, 8 deletions(-)


hooks/post-receive
-- 
CMake