Mercurial > flash_v2
changeset 496:6c2a59f5102f
* standalone/wxwin/ecutils.cpp: #include <errno.h>
* standalone/wxwin/filename.h: Make header macro unique
| author | jld |
|---|---|
| date | Thu, 16 Jan 2003 17:19:31 +0000 |
| parents | 248ae32b58f8 |
| children | 84ef0d76f1f1 |
| files | host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/ecutils.cpp host/tools/configtool/standalone/wxwin/filename.h |
| diffstat | 3 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog +++ b/host/tools/configtool/ChangeLog @@ -1,3 +1,9 @@ +2003-01-16 John Dallaway <jld@ecoscentric.com> + + * standalone/wxwin/ecutils.cpp: #include <errno.h> + + * standalone/wxwin/filename.h: Make header macro unique + 2002-09-21 Bart Veer <bartv@ecoscentric.com> * common/common/build.cxx:
--- a/host/tools/configtool/standalone/wxwin/ecutils.cpp +++ b/host/tools/configtool/standalone/wxwin/ecutils.cpp @@ -63,11 +63,8 @@ #include <sys/types.h> #include <sys/stat.h> -// Otherwise we get a strange link error under Linux #ifndef __WXMSW__ -#ifdef errno -#undef errno -#endif +#include <errno.h> #endif #ifdef __WXMSW__ @@ -191,7 +188,6 @@ int ecUtils::vMessageBox(UINT nType, LPC bool ecUtils::StrToItemIntegerType(const wxString & str, long &d) { - extern int errno; wxChar* pEnd; bool rc; errno=0; @@ -218,7 +214,6 @@ const wxString ecUtils::DoubleToStr (dou bool ecUtils::StrToDouble (const wxString & strValue, double &dValue) { - extern int errno; wxChar* pEnd; errno = 0; //dValue = _tcstod (strValue, &pEnd);
--- a/host/tools/configtool/standalone/wxwin/filename.h +++ b/host/tools/configtool/standalone/wxwin/filename.h @@ -44,8 +44,8 @@ // //=========================================================================== -#ifndef _WX_FILENAME_H_ -#define _WX_FILENAME_H_ +#ifndef _ECOS_FILENAME_H_ +#define _ECOS_FILENAME_H_ #include "wx/wxchar.h" #include "wx/dir.h" @@ -179,5 +179,5 @@ public: bool Ok() const { return !m_strPrevDir.IsEmpty(); } }; -#endif -// _WX_FILENAME_H_ +#endif +// _ECOS_FILENAME_H_