summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Lantinga <slouken@libsdl.org>2011-02-27 22:22:58 -0800
committerSam Lantinga <slouken@libsdl.org>2011-02-27 22:22:58 -0800
commite32b25be9e525f6358f26221cb6002ca5c9e3fd6 (patch)
treea52bdc0772acd726b353e2d547aa0eb92939b752
parentcde0d1bc03cf6d0b96bdff01b6e54e5cfa425570 (diff)
Fixed compiling AltiVec blitters
-rw-r--r--include/SDL_cpuinfo.h2
-rw-r--r--src/video/SDL_blit_A.c5
-rw-r--r--src/video/SDL_blit_N.c5
3 files changed, 6 insertions, 6 deletions
diff --git a/include/SDL_cpuinfo.h b/include/SDL_cpuinfo.h
index ef4d1d3c..9ac4b993 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 171f8786..d6e039e9 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 180efc82..413d74e1 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;