--- a/src/video/SDL_blit_N.c	Tue Feb 07 09:29:18 2006 +0000
+++ b/src/video/SDL_blit_N.c	Tue Feb 07 10:40:14 2006 +0000
@@ -21,6 +21,7 @@
 */
 
 #include "SDL_types.h"
+#include "SDL_string.h"
 #include "SDL_video.h"
 #include "SDL_blit.h"
 #include "SDL_byteorder.h"
@@ -657,9 +658,7 @@
     Uint32 *dst = (Uint32 *) info->d_pixels;
     int dstskip = info->d_skip;
     SDL_PixelFormat *srcfmt = info->src;
-    int srcbpp = srcfmt->BytesPerPixel;
     SDL_PixelFormat *dstfmt = info->dst;
-    int dstbpp = dstfmt->BytesPerPixel;
     vector unsigned int vzero = vec_splat_u32(0);
     vector unsigned char vpermute = calc_swizzle32(srcfmt, dstfmt);
     if (dstfmt->Amask && !srcfmt->Amask) {
@@ -670,8 +669,8 @@
         }
     }
 
-    assert(srcbpp == 4);
-    assert(dstbpp == 4);
+    assert(srcfmt->BytesPerPixel == 4);
+    assert(dstfmt->BytesPerPixel == 4);
 
     while (height--) {
         vector unsigned char valigner;
@@ -737,9 +736,7 @@
     Uint32 *dst = (Uint32 *) info->d_pixels;
     int dstskip = info->d_skip;
     SDL_PixelFormat *srcfmt = info->src;
-    int srcbpp = srcfmt->BytesPerPixel;
     SDL_PixelFormat *dstfmt = info->dst;
-    int dstbpp = dstfmt->BytesPerPixel;
     vector unsigned int vzero = vec_splat_u32(0);
     vector unsigned char vpermute = calc_swizzle32(srcfmt, dstfmt);
     if (dstfmt->Amask && !srcfmt->Amask) {
@@ -750,8 +747,8 @@
         }
     }
 
-    assert(srcbpp == 4);
-    assert(dstbpp == 4);
+    assert(srcfmt->BytesPerPixel == 4);
+    assert(dstfmt->BytesPerPixel == 4);
 
     while (height--) {
         vector unsigned char valigner;

--- a/src/video/math_private.h	Tue Feb 07 09:29:18 2006 +0000
+++ b/src/video/math_private.h	Tue Feb 07 10:40:14 2006 +0000
@@ -19,8 +19,10 @@
 
 #include "SDL_endian.h"
 
-typedef Sint32 int32_t;
-typedef Uint32 u_int32_t;
+#define int32_t 	math_int32_t
+#define u_int32_t	math_u_int32_t
+typedef Sint32 math_int32_t;
+typedef Uint32 math_u_int32_t;
 
 /* The original fdlibm code used statements like:
 	n0 = ((*(int*)&one)>>29)^1;		* index of high word *