diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-31 17:11:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-31 17:11:58 (GMT) |
| commit | 5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8 (patch) | |
| tree | a73f41ac49686a9adc8bb27d0c9729833a22580d /Source/kwsys/SystemInformation.cxx | |
| parent | 8b16e62c7a10c246744327cde38b0b1d70eb8c48 (diff) | |
| parent | 72b5b48040ed65fdb54b8ffeb3326b456586b8c8 (diff) | |
| download | CMake-5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8.zip CMake-5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8.tar.gz CMake-5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/SystemInformation.cxx')
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 84b5f39..d23c248 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -5156,7 +5156,7 @@ bool SystemInformationImplementation::QueryOSInformation() } } - sprintf (operatingSystem, "%s (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); + sprintf (operatingSystem, "%ls (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); this->OSVersion = operatingSystem; } else @@ -5205,7 +5205,7 @@ bool SystemInformationImplementation::QueryOSInformation() if (osvi.dwMajorVersion <= 4) { // NB: NT 4.0 and earlier. - sprintf (operatingSystem, "version %ld.%ld %s (Build %ld)", + sprintf (operatingSystem, "version %ld.%ld %ls (Build %ld)", osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.szCSDVersion, @@ -5236,7 +5236,7 @@ bool SystemInformationImplementation::QueryOSInformation() else { // Windows 2000 and everything else. - sprintf (operatingSystem,"%s (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); + sprintf (operatingSystem,"%ls (Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); this->OSVersion = operatingSystem; } break; |