.uppsrc: MSC10 fixes

git-svn-id: svn://ultimatepp.org/upp/trunk@2395 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2010-05-14 13:07:58 +00:00
parent a70015f78b
commit 2eac4aec79
2 changed files with 2 additions and 2 deletions

View file

@ -296,7 +296,7 @@ static const MemDiagCls sMemDiagHelper__upp__;
//some global definitions
#if !defined(STLPORT)
#if !defined(STLPORT) && _MSC_VER < 1600
inline UPP::int64 abs(UPP::int64 x) { return x < 0 ? -x : x; }
#endif

View file

@ -129,7 +129,7 @@ public:
#if defined(PLATFORM_WIN32)
static int GetErrorCode() { return WSAGetLastError(); }
#define SOCKERR(x) COMBINE(WSA, x)
#define SOCKERR(x) WSA##x
#elif defined(PLATFORM_POSIX)
static int GetErrorCode() { return errno; }
#define SOCKERR(x) x