Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
CMake
CMake
Commits
f59693b9
Commit
f59693b9
authored
Oct 08, 2013
by
Brad King
Browse files
Merge branch 'upstream-kwsys' into update-kwsys
parents
43405072
1a39f857
Changes
3
Hide whitespace changes
Inline
Side-by-side
Source/kwsys/SystemInformation.cxx
View file @
f59693b9
...
...
@@ -1734,12 +1734,12 @@ int SystemInformationImplementation::GetFullyQualifiedDomainName(
{
char
host
[
NI_MAXHOST
]
=
{
'\0'
};
socklen
_t
addrlen
const
size
_t
addrlen
=
(
fam
==
AF_INET
?
sizeof
(
struct
sockaddr_in
)
:
sizeof
(
struct
sockaddr_in6
));
ierr
=
getnameinfo
(
ifa
->
ifa_addr
,
addrlen
,
static_cast
<
socklen_t
>
(
addrlen
)
,
host
,
NI_MAXHOST
,
NULL
,
...
...
@@ -3836,7 +3836,8 @@ bool SystemInformationImplementation::QueryLinuxMemory()
unsigned
long
temp
;
unsigned
long
cachedMem
;
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
;
if
(
r
==
buffer
)
{
...
...
Source/kwsys/SystemTools.cxx
View file @
f59693b9
...
...
@@ -152,11 +152,6 @@ public:
#define _chdir chdir
#endif
#if defined(__HAIKU__)
#include
<os/kernel/OS.h>
#include
<os/storage/Path.h>
#endif
#if defined(__BEOS__) && !defined(__ZETA__)
#include
<be/kernel/OS.h>
#include
<be/storage/Path.h>
...
...
Source/kwsys/testDynamicLoader.cxx
View file @
f59693b9
...
...
@@ -15,14 +15,10 @@
#include KWSYS_HEADER(ios/iostream)
#include KWSYS_HEADER(stl/string)
#if defined(__BEOS__)
#if defined(__BEOS__)
|| defined(__HAIKU__)
#include
<be/kernel/OS.h>
/* disable_debugger() API. */
#endif
#if defined(__HAIKU__)
#include
<os/kernel/OS.h>
/* disable_debugger() API. */
#endif
// Work-around CMake dependency scanning limitation. This must
// duplicate the above list of headers.
#if 0
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment