diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-29 12:56:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-05-29 12:56:20 (GMT) |
| commit | 2c0c59a2e182e25844ded2a551a79e58ab3b3c49 (patch) | |
| tree | 55a7a37e8954f9a67c128dd49987067c7ccd0f9f /Source/kwsys/SystemInformation.cxx | |
| parent | 6927b25affcb9e2e01fb226970fd91db143b5101 (diff) | |
| parent | 927012979e54a69d9d49f188ce73f7b4ca2fb073 (diff) | |
| download | CMake-2c0c59a2e182e25844ded2a551a79e58ab3b3c49.zip CMake-2c0c59a2e182e25844ded2a551a79e58ab3b3c49.tar.gz CMake-2c0c59a2e182e25844ded2a551a79e58ab3b3c49.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/SystemInformation.cxx')
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 9e2a93d..9db1dee 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -1471,7 +1471,7 @@ int SystemInformationImplementation::GetFullyQualifiedDomainName( { char host[NI_MAXHOST]={'\0'}; - int addrlen + socklen_t addrlen = (fam==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6)); ierr=getnameinfo( @@ -3487,7 +3487,7 @@ bool SystemInformationImplementation::QueryLinuxMemory() bool have[6] = { false, false, false, false, false, false }; unsigned long value[6]; int count = 0; - while(fgets(buffer, sizeof(buffer), fd)) + while(fgets(buffer, static_cast<int>(sizeof(buffer)), fd)) { for(int i=0; i < 6; ++i) { |