Use #ifdef instead of #if ORIGINAL in dlls/msvidc32/msvideo1.c

Gerald Pfeifer gerald at pfeifer.com
Fri Nov 20 16:13:16 CST 2009


This converts to "new" style; these are the three only references to
ORIGINAL in this directory, so this should not have any side effects.

Gerald

ChangeLog:
Guard old code by #ifdef instead of plain #if.

diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c
index ab51e4c..3052964 100644
--- a/dlls/msvidc32/msvideo1.c
+++ b/dlls/msvidc32/msvideo1.c
@@ -132,7 +132,7 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s
                 for (pixel_y = 0; pixel_y < 4; pixel_y++) {
                     for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1)
                     {
-#if ORIGINAL
+#ifdef ORIGINAL
                         pixels[pixel_ptr++] = colors[(flags & 0x1) ^ 1];
 #else
                         pixels[width*(height-(pixel_ptr/width)-1) + 
@@ -154,7 +154,7 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s
                 for (pixel_y = 0; pixel_y < 4; pixel_y++) {
                     for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1)
                     {
-#if ORIGINAL
+#ifdef ORIGINAL
                         pixels[pixel_ptr++] = 
                             colors[((pixel_y & 0x2) << 1) + 
                                 (pixel_x & 0x2) + ((flags & 0x1) ^ 1)];
@@ -175,7 +175,7 @@ msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_s
                 for (pixel_y = 0; pixel_y < 4; pixel_y++) {
                     for (pixel_x = 0; pixel_x < 4; pixel_x++)
                     {
-#if ORIGINAL
+#ifdef ORIGINAL
                         pixels[pixel_ptr++] = colors[0];
 #else
                         pixels[width*(height-(pixel_ptr/width)-1) + 



More information about the wine-patches mailing list