From d002158db46ef9699e19f9da343686e23e3b6e79 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sat, 18 May 2002 11:30:38 +0000
Subject: [PATCH] Avoid a conflict in the definition of int32

---
 src/hermes/HeadX86.h   | 16 ++++++++--------
 src/video/SDL_blit_N.c |  1 -
 src/video/SDL_yuv_sw.c |  1 -
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/hermes/HeadX86.h b/src/hermes/HeadX86.h
index 6e10427f..6cd65717 100644
--- a/src/hermes/HeadX86.h
+++ b/src/hermes/HeadX86.h
@@ -60,10 +60,10 @@ void ConvertX86pI8_32();
 void ConvertX86pI8_24();
 void ConvertX86pI8_16();
 
-extern int32 ConvertX86p16_32RGB888_LUT_X86[512];
-extern int32 ConvertX86p16_32BGR888_LUT_X86[512];
-extern int32 ConvertX86p16_32RGBA888_LUT_X86[512];
-extern int32 ConvertX86p16_32BGRA888_LUT_X86[512];
+extern int ConvertX86p16_32RGB888_LUT_X86[512];
+extern int ConvertX86p16_32BGR888_LUT_X86[512];
+extern int ConvertX86p16_32RGBA888_LUT_X86[512];
+extern int ConvertX86p16_32BGRA888_LUT_X86[512];
   
 #ifdef __cplusplus
 }
@@ -124,10 +124,10 @@ extern int32 ConvertX86p16_32BGRA888_LUT_X86[512];
   void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24")));
   void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16")));
 
-  extern int32 ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86")));
-  extern int32 ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86")));
-  extern int32 ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86")));
-  extern int32 ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
+  extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86")));
+  extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86")));
+  extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86")));
+  extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
 #endif
 
   #ifdef __cplusplus
diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c
index a611c816..18a2c36a 100644
--- a/src/video/SDL_blit_N.c
+++ b/src/video/SDL_blit_N.c
@@ -49,7 +49,6 @@ static char rcsid =
 #define HermesConverterInterface	SDL_BlitInfo
 #define HermesClearInterface		void
 #define STACKCALL
-typedef Uint32 int32;
 
 #include "HeadMMX.h"
 #include "HeadX86.h"
diff --git a/src/video/SDL_yuv_sw.c b/src/video/SDL_yuv_sw.c
index 98e95769..ffd67d71 100644
--- a/src/video/SDL_yuv_sw.c
+++ b/src/video/SDL_yuv_sw.c
@@ -109,7 +109,6 @@ static char rcsid =
 #define HermesConverterInterface	void
 #define HermesClearInterface		void
 #define STACKCALL
-typedef Uint32 int32;
 
 #include "HeadX86.h"
 #endif