[Spice-devel] [PATCH 07/11] client/windows: arraysize(inf.bmiColors) == 1 in mingw32

[Alon Levy]

---
 client/windows/red_pixmap_gdi.cpp |    3 +++
 client/windows/red_pixmap_sw.cpp  |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/client/windows/red_pixmap_gdi.cpp b/client/windows/red_pixmap_gdi.cpp
index 4336f46..2d93113 100644
--- a/client/windows/red_pixmap_gdi.cpp
+++ b/client/windows/red_pixmap_gdi.cpp
@@ -64,9 +64,12 @@ RedPixmapGdi::RedPixmapGdi(int width, int height, RedDrawable::Format format, bo
         bitmap_info.inf.bmiColors[0].rgbRed = 0;
         bitmap_info.inf.bmiColors[0].rgbGreen = 0;
         bitmap_info.inf.bmiColors[0].rgbBlue = 0;
+#ifndef __MINGW32__
+        // inf.bmiColors is [1] in mingw/include/wingdi.h
         bitmap_info.inf.bmiColors[1].rgbRed = 0xff;
         bitmap_info.inf.bmiColors[1].rgbGreen = 0xff;
         bitmap_info.inf.bmiColors[1].rgbBlue = 0xff;
+#endif
         break;
      case RedDrawable::RGB16_565:
         pixel_format = (DWORD *)bitmap_info.inf.bmiColors;
diff --git a/client/windows/red_pixmap_sw.cpp b/client/windows/red_pixmap_sw.cpp
index 991b673..9ed1460 100644
--- a/client/windows/red_pixmap_sw.cpp
+++ b/client/windows/red_pixmap_sw.cpp
@@ -77,9 +77,12 @@ RedPixmapSw::RedPixmapSw(int width, int height, RedDrawable::Format format,
         bitmap_info.inf.bmiColors[0].rgbRed = 0;
         bitmap_info.inf.bmiColors[0].rgbGreen = 0;
         bitmap_info.inf.bmiColors[0].rgbBlue = 0;
+#ifndef __MINGW32__
+        // inf.bmiColors is [1] in mingw/include/wingdi.h
         bitmap_info.inf.bmiColors[1].rgbRed = 0xff;
         bitmap_info.inf.bmiColors[1].rgbGreen = 0xff;
         bitmap_info.inf.bmiColors[1].rgbBlue = 0xff;
+#endif
         break;
     case RedDrawable::RGB16_565:
         pixel_format = (DWORD *)bitmap_info.inf.bmiColors;
-- 
1.7.8.2