kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream-kwsys' into update-kwsys

This commit is contained in:
Brad King 2013-10-08 09:53:13 -04:00
parent 4340507207 1a39f857f7
commit f59693b971
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/kwsys/SystemInformation.cxx
View File

@ -1734,12 +1734,12 @@ int SystemInformationImplementation::GetFullyQualifiedDomainName(
{ {
char host[NI_MAXHOST]={'\0'}; char host[NI_MAXHOST]={'\0'};
socklen_t addrlen const size_t addrlen
= (fam==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6)); = (fam==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6));
ierr=getnameinfo( ierr=getnameinfo(
ifa->ifa_addr, ifa->ifa_addr,
addrlen, static_cast<socklen_t>(addrlen),
host, host,
NI_MAXHOST, NI_MAXHOST,
NULL, NULL,
@ -3836,7 +3836,8 @@ bool SystemInformationImplementation::QueryLinuxMemory()
unsigned long temp; unsigned long temp;
unsigned long cachedMem; unsigned long cachedMem;
unsigned long buffersMem; unsigned long buffersMem;
char *r=fgets(buffer, sizeof(buffer), fd); // Skip "total: used:..." // Skip "total: used:..."
char *r=fgets(buffer, static_cast<int>(sizeof(buffer)), fd);
int status=0; int status=0;
if(r==buffer) if(r==buffer)
{ {

5
Source/kwsys/SystemTools.cxx
View File

@ -152,11 +152,6 @@ public:
#define _chdir chdir #define _chdir chdir
#endif #endif
#if defined(__HAIKU__)
#include <os/kernel/OS.h>
#include <os/storage/Path.h>
#endif
#if defined(__BEOS__) && !defined(__ZETA__) #if defined(__BEOS__) && !defined(__ZETA__)
#include <be/kernel/OS.h> #include <be/kernel/OS.h>
#include <be/storage/Path.h> #include <be/storage/Path.h>

6
Source/kwsys/testDynamicLoader.cxx
View File

@ -15,14 +15,10 @@
#include KWSYS_HEADER(ios/iostream) #include KWSYS_HEADER(ios/iostream)
#include KWSYS_HEADER(stl/string) #include KWSYS_HEADER(stl/string)
#if defined(__BEOS__) #if defined(__BEOS__) || defined(__HAIKU__)
#include <be/kernel/OS.h> /* disable_debugger() API. */ #include <be/kernel/OS.h> /* disable_debugger() API. */
#endif #endif
#if defined(__HAIKU__)
#include <os/kernel/OS.h> /* disable_debugger() API. */
#endif
// Work-around CMake dependency scanning limitation. This must // Work-around CMake dependency scanning limitation. This must
// duplicate the above list of headers. // duplicate the above list of headers.
#if 0 #if 0