From 0fbaa63cb25110385622a9f5a534c990d35e06c4 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 May 2012 08:32:57 -0400 Subject: 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. --- Source/kwsys/SystemTools.cxx | 4 ---- 1 file changed, 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__ -- cgit v0.12