OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Update6 for MSVC10

Browse Source 
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.
This commit is contained in:
Skoader
2012-04-22 14:55:35 +10:00
parent 5a1b5bf055
commit 8bdf479bdc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h
View File

@ -56,6 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif #endif
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stddef.h>
#endif #endif
#if HS_CAN_USE_FLOAT #if HS_CAN_USE_FLOAT
@ -85,7 +86,6 @@ typedef unsigned long long qword;
typedef size_t unsigned_ptr; typedef size_t unsigned_ptr;
typedef unsigned short wchar_t;
typedef wchar_t wchar; typedef wchar_t wchar;
#define kPosInfinity16 (32767) #define kPosInfinity16 (32767)

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp
View File

@ -162,12 +162,12 @@ bool GuidIsNil (const Uuid & uuid) {
const wchar * GuidToString (const Uuid & uuid, wchar * dst, unsigned chars) { const wchar * GuidToString (const Uuid & uuid, wchar * dst, unsigned chars) {
wchar * src; wchar * src;
RPC_STATUS s; RPC_STATUS s;
s = UuidToStringW( (GUID *) &uuid, &src ); s = UuidToStringW( (GUID *) &uuid, (unsigned short **)&src );
if (RPC_S_OK == s) if (RPC_S_OK == s)
StrCopy(dst, src, chars); StrCopy(dst, src, chars);
else else
StrCopy(dst, L"", chars); StrCopy(dst, L"", chars);
RpcStringFreeW(&src); RpcStringFreeW((unsigned short **)&src);
return dst; return dst;
} }