libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-25 05:34:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TONY: Fix compilation on FreeBSD with C++-11 enabled.

Browse Source 
This is part of bug #3615056 and is due to NULL being defined as
nullptr when C++-11 is enabled, which is not valid being assigned
to a integer value.
This commit is contained in:
D G Turner 2013-09-28 01:37:15 +01:00
parent e07723e1d1
commit 93c3375244
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/tony/mpal/mpal.cpp
View File

@ -409,7 +409,7 @@ static uint32 *getSelectList(uint32 i) {
sl[k++] = dialog->_choice[i]._select[j]._dwData; sl[k++] = dialog->_choice[i]._select[j]._dwData;
} }
sl[k] = (uint32)NULL; sl[k] = 0;
return sl; return sl;
} }
@ -436,7 +436,7 @@ static uint32 *GetItemList(uint32 nLoc) {
} }
} }
il[j] = (uint32)NULL; il[j] = 0;
return il; return il;
} }
@ -832,7 +832,7 @@ void LocationPollThread(CORO_PARAM, const void *param) {
if (_ctx->k == 0) if (_ctx->k == 0)
// We can remove this item from the list // We can remove this item from the list
_ctx->il[_ctx->i] = (uint32)NULL; _ctx->il[_ctx->i] = 0;
else else
_ctx->nRealItems++; _ctx->nRealItems++;
} }