From 2f29b38721d3845025479464f8cc6168c41cbfd5 Mon Sep 17 00:00:00 2001
From: Sebastien Barre <sebastien.barre@kitware.com>
Date: Fri, 17 Oct 2008 11:29:30 -0400
Subject: [PATCH] ENH: fix for VS6 and Cygwin
---
SystemInformation.cxx | 12 ++++++++----
kwsysDateStamp.cmake | 2 +-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 27b4af7..08a7d17 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -13,6 +13,10 @@
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
+#ifdef _WIN32
+# include <winsock.h> // WSADATA, include before sys/types.h
+#endif
+
#include "kwsysPrivate.h"
#include KWSYS_HEADER(FundamentalType.h)
#include KWSYS_HEADER(stl/string)
@@ -2147,7 +2151,7 @@ int SystemInformationImplementation::RetreiveInformationFromCpuInfoFile()
FILE *fd = fopen("/proc/cpuinfo", "r" );
if ( !fd )
{
- kwsys_ios::cout << "Problem opening /proc/cpuinfo" << kwsys_stl::endl;
+ kwsys_ios::cout << "Problem opening /proc/cpuinfo" << kwsys_ios::endl;
return 0;
}
@@ -2279,7 +2283,7 @@ int SystemInformationImplementation::QueryMemory()
int errorFlag = uname(&unameInfo);
if( errorFlag!=0 )
{
- kwsys_ios::cout << "Problem calling uname(): " << strerror(errno) << kwsys_stl::endl;
+ kwsys_ios::cout << "Problem calling uname(): " << strerror(errno) << kwsys_ios::endl;
return 0;
}
@@ -2303,7 +2307,7 @@ int SystemInformationImplementation::QueryMemory()
FILE *fd = fopen("/proc/meminfo", "r" );
if ( !fd )
{
- kwsys_ios::cout << "Problem opening /proc/meminfo" << kwsys_stl::endl;
+ kwsys_ios::cout << "Problem opening /proc/meminfo" << kwsys_ios::endl;
return 0;
}
@@ -2810,7 +2814,7 @@ kwsys_stl::string SystemInformationImplementation::RunProcess(kwsys_stl::vector<
{
// Should not get here.
kwsys_ios::cerr << "Unexpected ending state after running " << args[0]
- << kwsys_stl::endl;
+ << kwsys_ios::endl;
} break;
}
kwsysProcess_Delete(gp);
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index be4bd92..985ffd9 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2008)
SET(KWSYS_DATE_STAMP_MONTH 10)
# KWSys version date day component. Format is DD.
-SET(KWSYS_DATE_STAMP_DAY 16)
+SET(KWSYS_DATE_STAMP_DAY 17)
--
GitLab