summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-11-09 12:12:59 +1100
committer Vas Crabb <vas@vastheman.com>2017-11-09 12:12:59 +1100
commit67726dae684eb9f6634f50da909ced7ba973b643 (patch)
tree6799a53554e1a678dc3c05df027df763bbeae791
parent57ca5a4593937e69f3612aeff4889616138be42b (diff)
suppress function-like macro expansion for MSVC (nw)
-rw-r--r--src/devices/video/voodoo.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp
index 4190ce773a6..259e24899e5 100644
--- a/src/devices/video/voodoo.cpp
+++ b/src/devices/video/voodoo.cpp
@@ -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));