diff options
| author | Brad King <brad.king@kitware.com> | 2012-05-23 12:32:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-05-23 12:32:57 (GMT) |
| commit | 0fbaa63cb25110385622a9f5a534c990d35e06c4 (patch) | |
| tree | 007ef3a4edbf424b472bc208a0e957b789619501 /Source/kwsys | |
| parent | 4df451131b7b4e44e12402fef94f4ad7207d17f0 (diff) | |
| download | CMake-0fbaa63cb25110385622a9f5a534c990d35e06c4.zip CMake-0fbaa63cb25110385622a9f5a534c990d35e06c4.tar.gz CMake-0fbaa63cb25110385622a9f5a534c990d35e06c4.tar.bz2 | |
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.
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
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__ |