Browse Source

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.
msvc10
Skoader 13 years ago
parent
commit
8bdf479bdc
  1. 2
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h
  2. 4
      MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp

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

@ -56,6 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
#include <stdlib.h>
#include <stdio.h>
#include <stddef.h>
#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)

4
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;
}

Loading…
Cancel
Save