[Cmake-commits] CMake branch, next, updated. v2.8.8-2925-ged4c743

[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  ed4c7436c0379eb4c1c07ef1455e68366bf87890 (commit)
       via  0fbaa63cb25110385622a9f5a534c990d35e06c4 (commit)
       via  4df451131b7b4e44e12402fef94f4ad7207d17f0 (commit)
      from  5cd83e87123fce024b449d01d7e40f6742e5b5d4 (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=ed4c7436c0379eb4c1c07ef1455e68366bf87890
commit ed4c7436c0379eb4c1c07ef1455e68366bf87890
Merge: 5cd83e8 0fbaa63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 24 07:57:30 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 24 07:57:30 2012 -0400

    Merge topic 'kwsys-no-win32-environ-decl' into next
    
    0fbaa63 KWSys: Remove unused environ declaration from SystemTools
    4df4511 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fbaa63cb25110385622a9f5a534c990d35e06c4
commit 0fbaa63cb25110385622a9f5a534c990d35e06c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 23 08:32:57 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 23 08:32:57 2012 -0400

    KWSys: Remove unused environ declaration from SystemTools
    
    Commit "KWSys: Fix SystemTools environment memory handling" (2012-04-26)
    added a _WIN32 case inside !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H to dllimport
    the "environ" global.  Howver, KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H is true
    on every Windows toolchain we support so the case is never reached.
    Furthermore, even if it were reached the use of dllimport is incorrect
    because the toolchain might not be compiling with a dynamic runtime
    library.  Remove the unused incorrect line and supporting conditionals.

diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index 8ab580f..66850e9 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -81,11 +81,7 @@
 #endif
 
 #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H
-# if defined(_WIN32)
-extern __declspec(dllimport) char **environ;
-# else
 extern char **environ;
-# endif
 #endif
 
 #ifdef __CYGWIN__

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

Summary of changes:
 Source/CMakeVersion.cmake    |    2 +-
 Source/kwsys/SystemTools.cxx |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake