1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-20 12:19:10 +00:00

Update1 for MSVC10

Capitalize the ref macro in hsTypes.h due to a name collision.
This commit is contained in:
Skoader
2012-04-22 12:22:32 +10:00
parent 9db1361535
commit 626da5ae70
42 changed files with 234 additions and 234 deletions

View File

@ -295,7 +295,7 @@ static void __cdecl ReportMem (EMemFile file, bool showDialog, const char fmt[],
//============================================================================
#ifdef MEM_DEBUG
static void __cdecl MemDumpCallback (void * mem, void * param) {
ref(MemDumpCallback);
REF(MemDumpCallback);
const _CrtMemBlockHeader * pHead = pHdr(mem);
MemDumpParam * dumpParam = (MemDumpParam *) param;
@ -337,7 +337,7 @@ static void __cdecl OnExitMemDumpCallback (void * mem, size_t) {
//===========================================================================
#ifdef MEM_DEBUG
static void __cdecl CheckLeaksOnExit () {
ref(CheckLeaksOnExit);
REF(CheckLeaksOnExit);
if (!ErrorGetOption(kErrOptDisableMemLeakChecking)) {
MemDumpParam param;
param.file = kMemLeaks;
@ -357,17 +357,17 @@ static int __cdecl CrtAllocHook (
const unsigned char * szFileName,
int nLine
) {
ref(method);
ref(pUserData);
ref(nSize);
ref(nBlockUse);
ref(lRequest);
ref(szFileName);
ref(nLine);
REF(method);
REF(pUserData);
REF(nSize);
REF(nBlockUse);
REF(lRequest);
REF(szFileName);
REF(nLine);
if (nBlockUse == _NORMAL_BLOCK) {
int xx = 0;
ref(xx);
REF(xx);
}
return 1;
@ -434,7 +434,7 @@ void MemValidateNow () {
//============================================================================
void MemSetValidation (unsigned on) {
ref(on);
REF(on);
#ifdef MEM_DEBUG
#endif // MEM_DEBUG
@ -459,7 +459,7 @@ void MemPopDisableTracking () {
//============================================================================
void MemSetColor (unsigned short color) {
ref(color);
REF(color);
#ifdef MEM_DEBUG
s_memColor = color & 0xFFFF;
@ -469,8 +469,8 @@ void MemSetColor (unsigned short color) {
//===========================================================================
void * MemAlloc (unsigned bytes, unsigned flags, const char file[], int line) {
ref(file);
ref(line);
REF(file);
REF(line);
#ifdef MEM_DEBUG
unsigned block;
@ -520,7 +520,7 @@ void * MemAlloc (unsigned bytes, unsigned flags, const char file[], int line) {
//============================================================================
void MemFree (void * ptr, unsigned flags) {
ref(flags);
REF(flags);
if (!ptr)
return;
@ -535,8 +535,8 @@ void MemFree (void * ptr, unsigned flags) {
//===========================================================================
void * MemRealloc (void * ptr, unsigned bytes, unsigned flags, const char file[], int line) {
ref(file);
ref(line);
REF(file);
REF(line);
#ifdef HS_DEBUGGING
unsigned oldBytes = ptr ? MemSize(ptr) : 0;