[Scummvm-cvs-logs] scummvm master -> 93c337524422cf93ea987abeb6fe44f088d9fe5b
digitall
dgturner at iee.org
Sat Sep 28 02:34:48 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
93c3375244 TONY: Fix compilation on FreeBSD with C++-11 enabled.
Commit: 93c337524422cf93ea987abeb6fe44f088d9fe5b
https://github.com/scummvm/scummvm/commit/93c337524422cf93ea987abeb6fe44f088d9fe5b
Author: D G Turner (digitall at scummvm.org)
Date: 2013-09-27T17:37:15-07:00
Commit Message:
TONY: Fix compilation on FreeBSD with C++-11 enabled.
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.
Changed paths:
engines/tony/mpal/mpal.cpp
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index 5e6d44f..7010c23 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -409,7 +409,7 @@ static uint32 *getSelectList(uint32 i) {
sl[k++] = dialog->_choice[i]._select[j]._dwData;
}
- sl[k] = (uint32)NULL;
+ sl[k] = 0;
return sl;
}
@@ -436,7 +436,7 @@ static uint32 *GetItemList(uint32 nLoc) {
}
}
- il[j] = (uint32)NULL;
+ il[j] = 0;
return il;
}
@@ -832,7 +832,7 @@ void LocationPollThread(CORO_PARAM, const void *param) {
if (_ctx->k == 0)
// We can remove this item from the list
- _ctx->il[_ctx->i] = (uint32)NULL;
+ _ctx->il[_ctx->i] = 0;
else
_ctx->nRealItems++;
}
More information about the Scummvm-git-logs
mailing list