From da4cddd787500b9da71e7c7877de9a17c6a7d1fc Mon Sep 17 00:00:00 2001 From: KWSys Robot Date: Mon, 15 Jun 2015 09:50:46 -0400 Subject: KWSys 2015-06-15 (d217407c) Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ d217407c | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 8533a79b..d217407c Brad King (1): d217407c SystemTools: Fix preprocessor check WIN32 => _WIN32 --- SystemTools.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SystemTools.cxx b/SystemTools.cxx index c834e34..fed1c9c 100644 --- a/SystemTools.cxx +++ b/SystemTools.cxx @@ -4408,7 +4408,7 @@ bool SystemTools::FileIsFullPath(const char* in_name, size_t len) bool SystemTools::GetShortPath(const kwsys_stl::string& path, kwsys_stl::string& shortPath) { -#if defined(WIN32) && !defined(__CYGWIN__) +#if defined(_WIN32) && !defined(__CYGWIN__) const int size = int(path.size()) +1; // size of return char *tempPath = new char[size]; // create a buffer DWORD ret; -- cgit v0.12