summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2007-09-24 17:21:25 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2007-09-24 17:21:25 (GMT)
commit150805258a2d78655dfce99e9f7483261c2483ff (patch)
tree13003562096ec025faaf946035136cfbbc73601b
parente10a354d7ea59b9f6a5f31a18ccee47b68648f2d (diff)
downloadCMake-150805258a2d78655dfce99e9f7483261c2483ff.zip
CMake-150805258a2d78655dfce99e9f7483261c2483ff.tar.gz
CMake-150805258a2d78655dfce99e9f7483261c2483ff.tar.bz2
ENH: add new machines
-rw-r--r--DartLocal.conf.in8
-rw-r--r--Source/cmSystemTools.cxx5
2 files changed, 9 insertions, 4 deletions
diff --git a/DartLocal.conf.in b/DartLocal.conf.in
index 4f35ab6..ce3bea8 100644
--- a/DartLocal.conf.in
+++ b/DartLocal.conf.in
@@ -1,7 +1,8 @@
ExpectedBuilds: \
{ARRAKIS.kitware Win32-bcc551} \
{ARRAKIS.kitware Win32-cygwin} \
-{ARRAKIS.kitware Win32-mingw} \
+{ARRAKIS.kitware Win32-mingw} \
+{ARRAKIS.kitware zRel24-Win32-bcc551} \
{dash1win64.kitware Win64-vs80} \
{dash1win98.kitware Win32-vs60} \
{DASH1.kitware Win32-nmake71} \
@@ -42,11 +43,14 @@ ExpectedBuilds: \
{dashsun1.kitware SunOS-gcc34-64} \
{destiny.kitware HP-UX-aCC-gmake} \
{destiny.kitware HP-UX-aCC} \
+{devqnx.acfr.usyd.edu.au qnx-V3.3.5-gcc_ntox86} \
{heart HP-UXia64-aCC} \
{hythloth.kitware Linux64-bullseye-cov} \
+{hythloth.kitware Linux-nightly-win32-release} \
{hythloth.kitware Linux64-suncc-5.9} \
-{iris.elemtech IRIX64-CC-7.4} \
+{iris.elemtech IRIX64-CC-7.4} \
{iris.elemtech IRIX64-CC64-7.4} \
+{JET.kitware Linux-valgrind2} \
{krondor.kitware Darwin-c++} \
{krondor.kitware zRel24-Darwin-c++} \
{midworld.kitware DarwinG5-XCode15} \
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index badde8b..5ed8a75 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -271,7 +271,8 @@ void cmSystemTools::Stdout(const char* s)
{
if(s_StdoutCallback)
{
- (*s_StdoutCallback)(s, strlen(s), s_StdoutCallbackClientData);
+ (*s_StdoutCallback)(s, static_cast<int>(strlen(s)),
+ s_StdoutCallbackClientData);
}
else
{
@@ -1653,7 +1654,7 @@ int cmSystemToolsGZStructClose(void* call_data)
ssize_t cmSystemToolsGZStructRead(void* call_data, void* buf, size_t count)
{
cmSystemToolsGZStruct* gzf = static_cast<cmSystemToolsGZStruct*>(call_data);
- return gzread(gzf->GZFile, buf, count);
+ return gzread(gzf->GZFile, buf, static_cast<int>(count));
}
ssize_t cmSystemToolsGZStructWrite(void* call_data, const void* buf,