This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Silence configtool compiler warnings for GNU/Cygwin build
- From: John Dallaway <jld at ecoscentric dot com>
- To: ecos-patches at sources dot redhat dot com
- Date: Sat, 25 Jan 2003 23:12:12 +0000
- Subject: Silence configtool compiler warnings for GNU/Cygwin build
- Organization: eCosCentric Limited
This patch silences various compiler warnings when building the
configtool using GNU/Cygwin tools. In particular, it is necessary to
#include winsock2.h before sys/types.h to avoid the fd_set compiler
warning.
Index: configtool/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/ChangeLog,v
retrieving revision 1.26
diff -u -5 -r1.26 ChangeLog
--- configtool/ChangeLog 22 Jan 2003 13:29:08 -0000 1.26
+++ configtool/ChangeLog 25 Jan 2003 22:57:22 -0000
@@ -1,5 +1,16 @@
+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
2003-01-21 John Dallaway <jld@ecoscentric.com>
Index: configtool/standalone/wxwin/appsettings.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/appsettings.cpp,v
retrieving revision 1.5
diff -u -5 -r1.5 appsettings.cpp
--- configtool/standalone/wxwin/appsettings.cpp 15 Dec 2001 13:42:19 -0000 1.5
+++ configtool/standalone/wxwin/appsettings.cpp 25 Jan 2003 22:57:26 -0000
@@ -72,11 +72,11 @@
// For SystemInfo
#ifdef __WXMSW__
#include <windows.h>
#include "wx/msw/winundef.h"
-#ifdef GetTempPath
+#if defined(GetTempPath) && !defined(__CYGWIN__)
#undef GetTempPath
#endif
#endif
/*
Index: configtool/standalone/wxwin/configtooldoc.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/configtooldoc.cpp,v
retrieving revision 1.10
diff -u -5 -r1.10 configtooldoc.cpp
--- configtool/standalone/wxwin/configtooldoc.cpp 20 Jan 2003 15:12:11 -0000 1.10
+++ configtool/standalone/wxwin/configtooldoc.cpp 25 Jan 2003 22:57:45 -0000
@@ -70,11 +70,11 @@
#include <windows.h>
#ifndef __CYGWIN__
#include <shlobj.h>
#endif
#include "wx/msw/winundef.h"
-#ifdef CreateDirectory
+#if defined(CreateDirectory) && !defined(__CYGWIN__)
#undef CreateDirectory
#endif
#endif
#include "configtooldoc.h"
Index: configtool/standalone/wxwin/ecpch.h
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/ecpch.h,v
retrieving revision 1.1
diff -u -5 -r1.1 ecpch.h
--- configtool/standalone/wxwin/ecpch.h 1 Jun 2001 22:16:30 -0000 1.1
+++ configtool/standalone/wxwin/ecpch.h 25 Jan 2003 22:57:45 -0000
@@ -48,10 +48,15 @@
#ifdef __VISUALC__
#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"
#include "wx/imaglist.h"
#include "wx/laywin.h"
Index: configtool/standalone/wxwin/filename.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/filename.cpp,v
retrieving revision 1.4
diff -u -5 -r1.4 filename.cpp
--- configtool/standalone/wxwin/filename.cpp 20 Jan 2003 15:12:12 -0000 1.4
+++ configtool/standalone/wxwin/filename.cpp 25 Jan 2003 22:57:45 -0000
@@ -45,10 +45,11 @@
#include <windows.h>
#include <shlwapi.h>
#include "wx/msw/winundef.h"
+#ifndef __CYGWIN__
#ifdef CreateDirectory
#undef CreateDirectory
#endif
#ifdef ExpandEnvironmentStrings
#undef ExpandEnvironmentStrings
@@ -59,10 +60,11 @@
#ifdef SetCurrentDirectory
#undef SetCurrentDirectory
#endif
#ifdef GetTempPath
#undef GetTempPath
+#endif
#endif
#else
// #include <dir.h>
Index: Utils/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/Utils/ChangeLog,v
retrieving revision 1.8
diff -u -5 -r1.8 ChangeLog
--- Utils/ChangeLog 20 Jan 2003 16:01:26 -0000 1.8
+++ Utils/ChangeLog 25 Jan 2003 22:57:45 -0000
@@ -1,5 +1,14 @@
+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:
Use "try" rather than "__try" for Cygwin builds.
Index: Utils/common/Collections.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/Utils/common/Collections.cpp,v
retrieving revision 1.2
diff -u -5 -r1.2 Collections.cpp
--- Utils/common/Collections.cpp 18 Apr 2000 21:51:56 -0000 1.2
+++ Utils/common/Collections.cpp 25 Jan 2003 22:57:45 -0000
@@ -20,10 +20,16 @@
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
// ----------------------------------------------------------------------------
//
//####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,...)
{
va_list args;
Index: Utils/common/eCosSocket.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/Utils/common/eCosSocket.cpp,v
retrieving revision 1.1
diff -u -5 -r1.1 eCosSocket.cpp
--- Utils/common/eCosSocket.cpp 18 Apr 2000 21:51:56 -0000 1.1
+++ Utils/common/eCosSocket.cpp 25 Jan 2003 22:57:46 -0000
@@ -814,7 +814,5 @@
return String::CStrToUnicodeStr(ip);
} else {
return it->second;
}
}
-
-
\ No newline at end of file