From 55821b28679ac9e4de5d279425e9b2c3959cf34f Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Fri, 19 Apr 2002 12:49:11 -0400 Subject: [PATCH] renamed unix to unixPath for compile error --- Source/cmNMakeMakefileGenerator.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmNMakeMakefileGenerator.cxx b/Source/cmNMakeMakefileGenerator.cxx index f70f7c67a..d140fec33 100644 --- a/Source/cmNMakeMakefileGenerator.cxx +++ b/Source/cmNMakeMakefileGenerator.cxx @@ -86,12 +86,12 @@ std::string cmNMakeMakefileGenerator::ShortPathCommand(const char* command) { c = removeIntDir.match(1) + removeIntDir.match(3); } - std::string unix = c; + std::string unixPath = c; // since the command may already be a windows path, convert it // to unix so we can use SplitProgramPath on it. - cmSystemTools::ConvertToUnixSlashes(unix); + cmSystemTools::ConvertToUnixSlashes(unixPath); std::string path, file; - cmSystemTools::SplitProgramPath(unix.c_str(), path, file); + cmSystemTools::SplitProgramPath(unixPath.c_str(), path, file); // do a short path on the directory, because ShortPath will // not work for files that do not exist path = this->ShortPath(path.c_str());