diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2015-01-09 20:37:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-10 17:09:01 (GMT) |
| commit | 54d83caecfc1e0b8f047037ea6aaa7d54b64d8b3 (patch) | |
| tree | 54e90e939ea343d88d170fe33c90c2c0ad22e7df /SystemTools.cxx | |
| parent | 6ed23ff4e9bbf848a77865e6d08c1e8e6074de92 (diff) | |
| download | CMake-54d83caecfc1e0b8f047037ea6aaa7d54b64d8b3.zip CMake-54d83caecfc1e0b8f047037ea6aaa7d54b64d8b3.tar.gz CMake-54d83caecfc1e0b8f047037ea6aaa7d54b64d8b3.tar.bz2 | |
KWSys 2015-01-09 (425fa73e)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 425fa73e | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 5a15cb3b..425fa73e
Ben Boeckel (1):
425fa73e Add missing malloc return value casts
Simon Gomizelj (1):
2f0165f1 Terminal: Add xterm-termite to VT100 color support whitelist
Stephen Kelly (3):
e4fe1d1a SystemTools: Refactor selection of Windows directory APIs
af86ac7d SystemTools: Fix build with SunCC/stlport.
d30c9b03 Workaround SolarisStudio bug with libstdc++.
Change-Id: Ib8fbe15d1ee072ac8d8506d92c8883056b224a89
Diffstat (limited to 'SystemTools.cxx')
| -rw-r--r-- | SystemTools.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/SystemTools.cxx b/SystemTools.cxx index e4c82d8..c2b6097 100644 --- a/SystemTools.cxx +++ b/SystemTools.cxx @@ -16,6 +16,14 @@ # define _XOPEN_SOURCE_EXTENDED #endif +#if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__MINGW32__)) +# define KWSYS_WINDOWS_DIRS +#else +# if defined(__SUNPRO_CC) +# include <fcntl.h> +# endif +#endif + #include "kwsysPrivate.h" #include KWSYS_HEADER(RegularExpression.hxx) #include KWSYS_HEADER(SystemTools.hxx) @@ -205,8 +213,7 @@ static time_t windows_filetime_to_posix_time(const FILETIME& ft) } #endif -#if defined(_WIN32) && (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__MINGW32__)) - +#ifdef KWSYS_WINDOWS_DIRS #include <wctype.h> inline int Mkdir(const kwsys_stl::string& dir) |