Mercurial > ecos-v2_0-branch
changeset 540:9034ec3868e5
* configtool/standalone/wxwin/ecpch.h: #include <winsock2.h> early for Cygwin
builds to eliminate fd_set compiler warning
* configtool/standalone/wxwin/filename.cpp,
configtool/standalone/wxwin/configtooldoc.cpp,
configtool/standalone/wxwin/appsettings.cpp: Do not #undef macros matching
ecFileName member functions referenced in these files for Cygwin builds.
* Utils/common/Collections.cpp: #include <winsock2.h> early for Cygwin
builds to eliminate fd_set compiler warning
* Utils/common/eCosSocket.cpp: Add newline at end of file to eliminate
compiler warning
| author | jld |
|---|---|
| date | Sat, 25 Jan 2003 23:07:53 +0000 |
| parents | 691a56b47b00 |
| children | ea8eda51bc88 |
| files | host/tools/Utils/ChangeLog host/tools/Utils/common/Collections.cpp host/tools/Utils/common/eCosSocket.cpp host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/appsettings.cpp host/tools/configtool/standalone/wxwin/configtooldoc.cpp host/tools/configtool/standalone/wxwin/ecpch.h host/tools/configtool/standalone/wxwin/filename.cpp |
| diffstat | 8 files changed, 35 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/host/tools/Utils/ChangeLog +++ b/host/tools/Utils/ChangeLog @@ -1,3 +1,12 @@ +2003-01-25 John Dallaway <jld@ecoscentric.com> + + * common/Collections.cpp: #include <winsock2.h> early for Cygwin + builds to eliminate fd_set compiler warning + + * common/eCosSocket.cpp: Add newline at end of file to eliminate + compiler warning + + 2003-01-20 John Dallaway <jld@ecoscentric.com> * common/eCosThreadUtils.cpp:
--- a/host/tools/Utils/common/Collections.cpp +++ b/host/tools/Utils/common/Collections.cpp @@ -22,6 +22,12 @@ // ---------------------------------------------------------------------------- // //####COPYRIGHTEND#### + +// include winsock2.h early to eliminate fd_set warning +#ifdef __CYGWIN__ +#include <winsock2.h> +#endif + #include "Collections.h" void String::Format (LPCTSTR const pszFormat,...)
--- a/host/tools/Utils/common/eCosSocket.cpp +++ b/host/tools/Utils/common/eCosSocket.cpp @@ -816,5 +816,3 @@ const String CeCosSocket::GetHostByName( return it->second; } } - - \ No newline at end of file
--- a/host/tools/configtool/ChangeLog +++ b/host/tools/configtool/ChangeLog @@ -1,3 +1,14 @@ +2003-01-25 John Dallaway <jld@ecoscentric.com> + + * standalone/wxwin/ecpch.h: #include <winsock2.h> early for Cygwin + builds to eliminate fd_set compiler warning + + * standalone/wxwin/filename.cpp, + standalone/wxwin/configtooldoc.cpp, + standalone/wxwin/appsettings.cpp: Do not #undef macros matching + ecFileName member functions referenced in these files for Cygwin + builds. + 2003-01-22 John Dallaway <jld@ecoscentric.com> * standalone/wxwin/makefile.gnu: Tidy up
--- a/host/tools/configtool/standalone/wxwin/appsettings.cpp +++ b/host/tools/configtool/standalone/wxwin/appsettings.cpp @@ -74,7 +74,7 @@ #ifdef __WXMSW__ #include <windows.h> #include "wx/msw/winundef.h" -#ifdef GetTempPath +#if defined(GetTempPath) && !defined(__CYGWIN__) #undef GetTempPath #endif #endif
--- a/host/tools/configtool/standalone/wxwin/configtooldoc.cpp +++ b/host/tools/configtool/standalone/wxwin/configtooldoc.cpp @@ -72,7 +72,7 @@ #include <shlobj.h> #endif #include "wx/msw/winundef.h" -#ifdef CreateDirectory +#if defined(CreateDirectory) && !defined(__CYGWIN__) #undef CreateDirectory #endif #endif
--- a/host/tools/configtool/standalone/wxwin/ecpch.h +++ b/host/tools/configtool/standalone/wxwin/ecpch.h @@ -50,6 +50,11 @@ #pragma warning(disable:4786) #endif +// include winsock2.h early to eliminate fd_set warning +#ifdef __CYGWIN__ +#include <winsock2.h> +#endif + #include "wx/wx.h" #include "wx/splitter.h" #include "wx/scrolwin.h"
--- a/host/tools/configtool/standalone/wxwin/filename.cpp +++ b/host/tools/configtool/standalone/wxwin/filename.cpp @@ -47,6 +47,7 @@ #include <shlwapi.h> #include "wx/msw/winundef.h" +#ifndef __CYGWIN__ #ifdef CreateDirectory #undef CreateDirectory #endif @@ -62,6 +63,7 @@ #ifdef GetTempPath #undef GetTempPath #endif +#endif #else