--- a/include/SDL_cpuinfo.h	Sun Feb 27 22:06:46 2011 -0800
+++ b/include/SDL_cpuinfo.h	Sun Feb 27 22:22:58 2011 -0800
@@ -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__

--- a/src/video/SDL_blit_A.c	Sun Feb 27 22:06:46 2011 -0800
+++ b/src/video/SDL_blit_A.c	Sun Feb 27 22:22:58 2011 -0800
@@ -499,10 +499,11 @@
      */
     /* 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;

--- a/src/video/SDL_blit_N.c	Sun Feb 27 22:06:46 2011 -0800
+++ b/src/video/SDL_blit_N.c	Sun Feb 27 22:22:58 2011 -0800
@@ -108,10 +108,11 @@
      */
     /* 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;