Gerold55
/
mame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

suppress function-like macro expansion for MSVC (nw)

master
Vas Crabb 2017-11-09 12:12:59 +11:00
parent 57ca5a4593
commit 67726dae68
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/video/voodoo.cpp
View File

@ -2588,8 +2588,8 @@ int32_t voodoo_device::register_w(voodoo_device *vd, offs_t offset, uint32_t dat
visarea.set(hbp, hbp + hvis - 1, vbp, vbp + vvis - 1);
/* keep within bounds */
visarea.max_x = std::min(visarea.max_x, htotal - 1);
visarea.max_y = std::min(visarea.max_y, vtotal - 1);
visarea.max_x = (std::min)(visarea.max_x, htotal - 1);
visarea.max_y = (std::min)(visarea.max_y, vtotal - 1);
/* compute the new period for standard res, medium res, and VGA res */
stdperiod = HZ_TO_ATTOSECONDS(15750) * vtotal;
@ -5258,7 +5258,7 @@ int32_t voodoo_device::fastfill(voodoo_device *vd)
for (y = sy; y < ey; y += ARRAY_LENGTH(extents))
{
poly_extra_data *extra = (poly_extra_data *)poly_get_extra_data(vd->poly);
int count = std::min(ey - y, int(ARRAY_LENGTH(extents)));
int count = (std::min)(ey - y, int(ARRAY_LENGTH(extents)));
extra->device = vd;
memcpy(extra->dither, dithermatrix, sizeof(extra->dither));