diff options
| -rw-r--r-- | Source/kwsys/ProcessWin32.c | 2 | ||||
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 6 | ||||
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Source/kwsys/ProcessWin32.c b/Source/kwsys/ProcessWin32.c index 2654a73..cba1e61 100644 --- a/Source/kwsys/ProcessWin32.c +++ b/Source/kwsys/ProcessWin32.c @@ -379,7 +379,7 @@ kwsysProcess* kwsysProcess_New(void) /* Construct the executable name from the process id and kwsysProcess instance. This should be unique. */ - sprintf(fwdName, KWSYS_NAMESPACE_STRING "pew9xfwd_%u_%p.exe", + sprintf(fwdName, KWSYS_NAMESPACE_STRING "pew9xfwd_%ld_%p.exe", GetCurrentProcessId(), cp); /* If we have a temp directory, use it. */ diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index ee762c7..058fddd 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -2998,7 +2998,7 @@ bool SystemInformationImplementation::QueryOSInformation() } } - sprintf (operatingSystem, "%s(Build %d)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); + sprintf (operatingSystem, "%s(Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); this->OSVersion = operatingSystem; } else @@ -3047,7 +3047,7 @@ bool SystemInformationImplementation::QueryOSInformation() if (osvi.dwMajorVersion <= 4) { // NB: NT 4.0 and earlier. - sprintf (operatingSystem, "version %d.%d %s (Build %d)", + sprintf (operatingSystem, "version %ld.%ld %s (Build %ld)", osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.szCSDVersion, @@ -3078,7 +3078,7 @@ bool SystemInformationImplementation::QueryOSInformation() else { // Windows 2000 and everything else. - sprintf (operatingSystem,"%s(Build %d)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); + sprintf (operatingSystem,"%s(Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); this->OSVersion = operatingSystem; } break; diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 7cd404e..d5d530d 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -3125,9 +3125,9 @@ void SystemTools::SplitPath(const char* p, if(root.size() == 1) { #if defined(_WIN32) && !defined(__CYGWIN__) - if(const char* p = getenv("USERPROFILE")) + if(const char* userp = getenv("USERPROFILE")) { - homedir = p; + homedir = userp; } else #endif @@ -4279,10 +4279,10 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion() } res += " "; - sprintf(buffer, "%d", osvi.dwMajorVersion); + sprintf(buffer, "%ld", osvi.dwMajorVersion); res += buffer; res += "."; - sprintf(buffer, "%d", osvi.dwMinorVersion); + sprintf(buffer, "%ld", osvi.dwMinorVersion); res += buffer; } @@ -4304,7 +4304,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion() if (lRet == ERROR_SUCCESS) { res += " Service Pack 6a (Build "; - sprintf(buffer, "%d", osvi.dwBuildNumber & 0xFFFF); + sprintf(buffer, "%ld", osvi.dwBuildNumber & 0xFFFF); res += buffer; res += ")"; } @@ -4313,7 +4313,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion() res += " "; res += osvi.szCSDVersion; res += " (Build "; - sprintf(buffer, "%d", osvi.dwBuildNumber & 0xFFFF); + sprintf(buffer, "%ld", osvi.dwBuildNumber & 0xFFFF); res += buffer; res += ")"; } @@ -4325,7 +4325,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion() res += " "; res += osvi.szCSDVersion; res += " (Build "; - sprintf(buffer, "%d", osvi.dwBuildNumber & 0xFFFF); + sprintf(buffer, "%ld", osvi.dwBuildNumber & 0xFFFF); res += buffer; res += ")"; } |