From e111cb35db20fc6327787e9421a179dee48abf03 Mon Sep 17 00:00:00 2001 From: sean Date: Tue, 12 Jun 2012 02:10:56 +0000 Subject: [PATCH] Fixed the other C4005 with EWOULDBLOCK EHOSTUNREACH ENETDOWN ENETUNREACH ENETRESET ETIMEDOUT EINPROGRESS ENOBUFS EMSGSIZE ENOBUFS _HAS_CPP0X so that now the Windows source of NMAP compiles without Compile time warnings. There are still link warnings though. --- nbase/nbase_winunix.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nbase/nbase_winunix.h b/nbase/nbase_winunix.h index 9a85cca65..cc301325b 100644 --- a/nbase/nbase_winunix.h +++ b/nbase/nbase_winunix.h @@ -130,6 +130,7 @@ #define _INC_ERRNO /* suppress errno.h */ #define _ERRNO_H_ /* Also for errno.h suppresion */ #define _SYSTEM_ERROR_ +#undef _HAS_CPP0X #define _HAS_CPP0X 0 /* Suppress winsock.h */ @@ -172,16 +173,25 @@ #define ECONNABORTED WSAECONNABORTED #undef ECONNRESET #define ECONNRESET WSAECONNRESET +#undef ECONNREFUSED #define ECONNREFUSED WSAECONNREFUSED #undef EAGAIN #define EAGAIN WSAEWOULDBLOCK +#undef EWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK +#undef EHOSTUNREACH #define EHOSTUNREACH WSAEHOSTUNREACH +#undef ENETDOWN #define ENETDOWN WSAENETDOWN +#undef ENETUNREACH #define ENETUNREACH WSAENETUNREACH +#undef ENETRESET #define ENETRESET WSAENETRESET +#undef ETIMEDOUT #define ETIMEDOUT WSAETIMEDOUT +#undef EHOSTDOWN #define EHOSTDOWN WSAEHOSTDOWN +#undef EINPROGRESS #define EINPROGRESS WSAEINPROGRESS #undef EINVAL #define EINVAL WSAEINVAL /* Invalid argument */ @@ -191,7 +201,9 @@ #define EACCES WSAEACCES /* Operation not permitted */ #undef EINTR #define EINTR WSAEINTR /* Interrupted system call */ +#undef ENOBUFS #define ENOBUFS WSAENOBUFS /* No buffer space available */ +#undef EMSGSIZE #define EMSGSIZE WSAEMSGSIZE /* Message too long */ #undef ENOMEM #define ENOMEM WSAENOBUFS