From cf9b841a378e9aaba7395258ecb8529d89f99be1 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sun, 27 Feb 2011 22:22:58 -0800
Subject: [PATCH] Fixed compiling AltiVec blitters

---
 include/SDL_cpuinfo.h  | 2 --
 src/video/SDL_blit_A.c | 5 +++--
 src/video/SDL_blit_N.c | 5 +++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/SDL_cpuinfo.h b/include/SDL_cpuinfo.h
index ef4d1d3c9..9ac4b9936 100644
--- a/include/SDL_cpuinfo.h
+++ b/include/SDL_cpuinfo.h
@@ -45,9 +45,7 @@
 #ifdef __ALTIVEC__
 #if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__)
 #include <altivec.h>
-#undef vector
 #undef pixel
-#undef bool
 #endif
 #endif
 #ifdef __MMX__
diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c
index 171f87864..d6e039e9b 100644
--- a/src/video/SDL_blit_A.c
+++ b/src/video/SDL_blit_A.c
@@ -499,10 +499,11 @@ calc_swizzle32(const SDL_PixelFormat * srcfmt, const SDL_PixelFormat * dstfmt)
      */
     /* ARGB */
     const static struct SDL_PixelFormat default_pixel_format = {
-        NULL, 0, 0,
+        0, NULL, 0, 0,
         0, 0, 0, 0,
         16, 8, 0, 24,
-        0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000
+        0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000,
+        0, NULL
     };
     if (!srcfmt) {
         srcfmt = &default_pixel_format;
diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c
index 180efc82c..413d74e11 100644
--- a/src/video/SDL_blit_N.c
+++ b/src/video/SDL_blit_N.c
@@ -108,10 +108,11 @@ calc_swizzle32(const SDL_PixelFormat * srcfmt, const SDL_PixelFormat * dstfmt)
      */
     /* ARGB */
     const static const struct SDL_PixelFormat default_pixel_format = {
-        NULL, 32, 4,
+        0, NULL, 0, 0,
         0, 0, 0, 0,
         16, 8, 0, 24,
-        0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000
+        0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000,
+        0, NULL
     };
     if (!srcfmt) {
         srcfmt = &default_pixel_format;