This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via f84b904da5b1c295ca8bd414bbb4b80003573de1 (commit)
via a234bcafd2487ff348546addd9d07f5c74549528 (commit)
from f9bc18215774b208b9f9b6d8d41bd67130b86bce (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f84b904da5b1c295ca8bd414bbb4b80003573de1
commit f84b904da5b1c295ca8bd414bbb4b80003573de1
Merge: f9bc182 a234bca
Author: Brad King <[email protected]>
AuthorDate: Wed Nov 12 09:36:46 2014 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Wed Nov 12 09:36:46 2014 -0500
Merge topic 'kwsys-SystemInformation-AIX-_SC_AIX_REALMEM' into next
a234bcaf KWSys SystemInformation: Check for _SC_AIX_REALMEM before using it
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a234bcafd2487ff348546addd9d07f5c74549528
commit a234bcafd2487ff348546addd9d07f5c74549528
Author: Ådne Hovda <[email protected]>
AuthorDate: Tue Nov 11 10:13:55 2014 +0100
Commit: Brad King <[email protected]>
CommitDate: Tue Nov 11 09:16:46 2014 -0500
KWSys SystemInformation: Check for _SC_AIX_REALMEM before using it
Add a check for supported flag when querying for system memory on
AIX 5.1.
diff --git a/Source/kwsys/SystemInformation.cxx
b/Source/kwsys/SystemInformation.cxx
index 84b5f39..c4aeb47 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -3913,7 +3913,7 @@ bool SystemInformationImplementation::QueryCygwinMemory()
bool SystemInformationImplementation::QueryAIXMemory()
{
-#if defined(_AIX)
+#if defined(_AIX) && defined(_SC_AIX_REALMEM)
long c = sysconf(_SC_AIX_REALMEM);
if (c <= 0)
{
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
