diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2012-10-01 18:58:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-10-01 19:02:39 (GMT) |
| commit | 5d0de36d2b2f420ab58841bbcd47c45fcdc4486e (patch) | |
| tree | 8cc5e0a3032c60cdc2f6c96d8fd00149df723954 /SystemTools.cxx | |
| parent | 7d3c2959fa9cb65b3be81bdfe3f69c29d31a9e67 (diff) | |
| download | CMake-5d0de36d2b2f420ab58841bbcd47c45fcdc4486e.zip CMake-5d0de36d2b2f420ab58841bbcd47c45fcdc4486e.tar.gz CMake-5d0de36d2b2f420ab58841bbcd47c45fcdc4486e.tar.bz2 | |
KWSys 2012-10-01 (bab53989)
Extract upstream KWSys using the following shell code.
$ sha1=bab53989d7c4027259bff837574f75003396d59f &&
git archive --prefix=KWSys-snapshot/ $sha1 |
tar x
$ git log 719638e2..bab53989 ^341043cf --no-merges --oneline --abbrev=8
bab53989 Tell Git to check tab-in-indent and no-lf-at-eof
8115bd1b SystemInformation: Pass extern "C" functions to sigaction
4f4dd224 SystemInformation: Fix unused assignment warnings
6b26d2fe SystemInformation: Use ifaddrs.h only where available
381923ed SystemInformation: Use si_code constants only where available
8f85338c SystemInformation: Use execinfo.h backtrace only where available
a8e98f98 SystemInformation: Use Windows API more portably
750b4b5c SystemInformation: Use long long or __int64 only where available
8d2cafcd SystemInformation: Fix UNIX system includes for FQDN
857bda17 SystemInformation: Report more information
63cbea35 Add and configure developer setup helper scripts
924466f5 SystemTools: Fix accidental bitwise instead of logical OR
2f423229 SystemTools: Remove unused environ declaration
a49c2417 Disable warnings about MS deprecation of C library
e3390720 CTestConfig: Submit to dedicated KWSys dashboard
Diffstat (limited to 'SystemTools.cxx')
| -rw-r--r-- | SystemTools.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/SystemTools.cxx b/SystemTools.cxx index 8ab580f..085d988 100644 --- a/SystemTools.cxx +++ b/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__ @@ -1669,7 +1665,7 @@ kwsys_stl::string SystemTools::EscapeChars( kwsys_stl::string n; if (str) { - if (!chars_to_escape | !*chars_to_escape) + if (!chars_to_escape || !*chars_to_escape) { n.append(str); } |