fix compile on MSVC 2012 & 2013 [Peter Ferrie]

This commit is contained in:
smf- 2014-09-26 12:01:03 +00:00
parent e19988600c
commit 632a43a964

View File

@ -1427,11 +1427,16 @@ if ((daddr & (BITS_PER_PIXEL - 1)) != 0) osd_printf_debug("PIXBLT_R%d with odd d
if (!TRANSPARENCY || pixel != 0) if (!TRANSPARENCY || pixel != 0)
dstword = (dstword & ~dstmask) | pixel; dstword = (dstword & ~dstmask) | pixel;
#if (BITS_PER_PIXEL<16)
/* update the source */ /* update the source */
srcmask = srcmask >> BITS_PER_PIXEL; srcmask = srcmask >> BITS_PER_PIXEL;
/* update the destination */ /* update the destination */
dstmask = dstmask >> BITS_PER_PIXEL; dstmask = dstmask >> BITS_PER_PIXEL;
#else
srcmask = 0;
dstmask = 0;
#endif
} }
/* write the result */ /* write the result */
@ -1469,11 +1474,16 @@ if ((daddr & (BITS_PER_PIXEL - 1)) != 0) osd_printf_debug("PIXBLT_R%d with odd d
if (!TRANSPARENCY || pixel != 0) if (!TRANSPARENCY || pixel != 0)
dstword = (dstword & ~dstmask) | pixel; dstword = (dstword & ~dstmask) | pixel;
#if (BITS_PER_PIXEL<16)
/* update the source */ /* update the source */
srcmask = srcmask >> BITS_PER_PIXEL; srcmask = srcmask >> BITS_PER_PIXEL;
/* update the destination */ /* update the destination */
dstmask = dstmask >> BITS_PER_PIXEL; dstmask = dstmask >> BITS_PER_PIXEL;
#else
srcmask = 0;
dstmask = 0;
#endif
} }
/* write the result */ /* write the result */
@ -1507,11 +1517,16 @@ if ((daddr & (BITS_PER_PIXEL - 1)) != 0) osd_printf_debug("PIXBLT_R%d with odd d
if (!TRANSPARENCY || pixel != 0) if (!TRANSPARENCY || pixel != 0)
dstword = (dstword & ~dstmask) | pixel; dstword = (dstword & ~dstmask) | pixel;
#if (BITS_PER_PIXEL<16)
/* update the source */ /* update the source */
srcmask = srcmask >> BITS_PER_PIXEL; srcmask = srcmask >> BITS_PER_PIXEL;
/* update the destination */ /* update the destination */
dstmask = dstmask >> BITS_PER_PIXEL; dstmask = dstmask >> BITS_PER_PIXEL;
#else
srcmask = 0;
dstmask = 0;
#endif
} }
/* write the result */ /* write the result */