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 | |
| 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
| -rw-r--r-- | EncodingC.c | 4 | ||||
| -rw-r--r-- | ProcessUNIX.c | 4 | ||||
| -rw-r--r-- | SystemTools.cxx | 11 | ||||
| -rw-r--r-- | Terminal.c | 1 | ||||
| -rw-r--r-- | kwsysPlatformTestsCXX.cxx | 4 |
5 files changed, 18 insertions, 6 deletions
diff --git a/EncodingC.c b/EncodingC.c index cda78e2..ba2cec2 100644 --- a/EncodingC.c +++ b/EncodingC.c @@ -44,7 +44,7 @@ wchar_t* kwsysEncoding_DupToWide(const char* str) size_t length = kwsysEncoding_mbstowcs(NULL, str, 0) + 1; if(length > 0) { - ret = malloc((length)*sizeof(wchar_t)); + ret = (wchar_t*)malloc((length)*sizeof(wchar_t)); ret[0] = 0; kwsysEncoding_mbstowcs(ret, str, length); } @@ -71,7 +71,7 @@ char* kwsysEncoding_DupToNarrow(const wchar_t* str) size_t length = kwsysEncoding_wcstombs(0, str, 0) + 1; if(length > 0) { - ret = malloc(length); + ret = (char*)malloc(length); ret[0] = 0; kwsysEncoding_wcstombs(ret, str, length); } diff --git a/ProcessUNIX.c b/ProcessUNIX.c index ca9d424..1be6d02 100644 --- a/ProcessUNIX.c +++ b/ProcessUNIX.c @@ -547,7 +547,7 @@ int kwsysProcess_SetPipeFile(kwsysProcess* cp, int prPipe, const char* file) } if(file) { - *pfile = malloc(strlen(file)+1); + *pfile = (char*)malloc(strlen(file)+1); if(!*pfile) { return 0; @@ -1468,7 +1468,7 @@ static int kwsysProcessInitialize(kwsysProcess* cp) cp->RealWorkingDirectoryLength = 4096; #endif cp->RealWorkingDirectory = - malloc((size_t)(cp->RealWorkingDirectoryLength)); + (char*)malloc((size_t)(cp->RealWorkingDirectoryLength)); if(!cp->RealWorkingDirectory) { return 0; 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) @@ -175,6 +175,7 @@ static const char* kwsysTerminalVT100Names[] = "xterm-88color", "xterm-color", "xterm-debian", + "xterm-termite", 0 }; diff --git a/kwsysPlatformTestsCXX.cxx b/kwsysPlatformTestsCXX.cxx index 3f947f3..82620da 100644 --- a/kwsysPlatformTestsCXX.cxx +++ b/kwsysPlatformTestsCXX.cxx @@ -548,6 +548,10 @@ int main() #if (defined(__GNUC__) || defined(__PGI)) && !defined(_GNU_SOURCE) # define _GNU_SOURCE #endif +#if defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x5130 \ + && __linux && __SUNPRO_CC_COMPAT == 'G' +# include <iostream> +#endif #include <cxxabi.h> int main() { |