From 8bdf479bdcd4886ff384855cc9a80ab4e3063910 Mon Sep 17 00:00:00 2001 From: Skoader Date: Sun, 22 Apr 2012 14:55:35 +1000 Subject: [PATCH] Update6 for MSVC10 Include stddef.h to avoid a redefinition problem with offsetof(s,m). Remove wchar_t typedef. This is a native type is MSVC10 and should be appropriately defined with the inclusion of stddef.h in earlier versions. --- .../Plasma20/Sources/Plasma/CoreLib/hsTypes.h | 2 +- .../Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h index c0c8d184..a47fd194 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h @@ -56,6 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #endif #include #include + #include #endif #if HS_CAN_USE_FLOAT @@ -85,7 +86,6 @@ typedef unsigned long long qword; typedef size_t unsigned_ptr; -typedef unsigned short wchar_t; typedef wchar_t wchar; #define kPosInfinity16 (32767) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp index cd904d3c..a586ae1d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp @@ -162,12 +162,12 @@ bool GuidIsNil (const Uuid & uuid) { const wchar * GuidToString (const Uuid & uuid, wchar * dst, unsigned chars) { wchar * src; RPC_STATUS s; - s = UuidToStringW( (GUID *) &uuid, &src ); + s = UuidToStringW( (GUID *) &uuid, (unsigned short **)&src ); if (RPC_S_OK == s) StrCopy(dst, src, chars); else StrCopy(dst, L"", chars); - RpcStringFreeW(&src); + RpcStringFreeW((unsigned short **)&src); return dst; }