From 2eac4aec7932207436281e83656acaf50abd2e12 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 14 May 2010 13:07:58 +0000
Subject: [PATCH] .uppsrc: MSC10 fixes

git-svn-id: svn://ultimatepp.org/upp/trunk@2395 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Core.h  | 2 +-
 uppsrc/Web/socket.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/uppsrc/Core/Core.h b/uppsrc/Core/Core.h
index 601bb805c..a80f0fda5 100644
--- a/uppsrc/Core/Core.h
+++ b/uppsrc/Core/Core.h
@@ -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
 
diff --git a/uppsrc/Web/socket.h b/uppsrc/Web/socket.h
index 2b9c59aeb..bb8011921 100644
--- a/uppsrc/Web/socket.h
+++ b/uppsrc/Web/socket.h
@@ -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