Mercurial > ecos-v2_0-branch
changeset 515:9589be2cc5c9
* common/eCosStd.h: #include winsock2.h and process.h for Cygwin builds.
* common/Properties.cpp: Use MIN macro rather than min() for portability.
| author | jld |
|---|---|
| date | Mon, 20 Jan 2003 14:50:12 +0000 |
| parents | 84fbdcadcb5f |
| children | 36f23a513952 |
| files | host/tools/Utils/ChangeLog host/tools/Utils/common/Properties.cpp host/tools/Utils/common/eCosStd.h |
| diffstat | 3 files changed, 11 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/host/tools/Utils/ChangeLog +++ b/host/tools/Utils/ChangeLog @@ -1,3 +1,11 @@ +2003-01-20 John Dallaway <jld@ecoscentric.com> + + * common/eCosStd.h: + #include winsock2.h and process.h for Cygwin builds. + + * common/Properties.cpp: + Use MIN macro rather than min() for portability. + 2002-08-03 Bart Veer <bartv@ecoscentric.com> * common/Makefile.am, common/configure.in, common/acinclude.m4:
--- a/host/tools/Utils/common/Properties.cpp +++ b/host/tools/Utils/common/Properties.cpp @@ -102,7 +102,7 @@ bool CProperties::LoadFromRegistry(HKEY break; case CProperty::Void: if(REG_BINARY==dwType){ - memcpy(p->pData,Data,min(dwDatalen,p->nLength)); + memcpy(p->pData,Data,MIN(dwDatalen,p->nLength)); } else { TRACE(_T("Type mismatch - %s: expected REG_BINARY, got %d\n"),(LPCTSTR)p->strName,dwType); rc=false;
--- a/host/tools/Utils/common/eCosStd.h +++ b/host/tools/Utils/common/eCosStd.h @@ -46,21 +46,10 @@ #define AFX_STDAFX_H__F20BA9C4_CFD5_11D2_BF75_00A0C949ADAC__INCLUDED_ #if defined(__CYGWIN__) + #include <winsock2.h> #include <winsock.h> - -#if 0 - #include <termios.h> #include <unistd.h> - #include <sys/wait.h> - #include <dirent.h> - #include <sys/file.h> - - #include <sys/socket.h> // socket etc... - #include <netinet/in.h> // inet_addr - #include <arpa/inet.h> // inet_addr - #include <netdb.h> // gethostbyname -#endif - #include <sys/timeb.h> + #include <process.h> #include <signal.h> #define cPathsep '/'