Avoid a conflict in the definition of int32
authorSam Lantinga <slouken@libsdl.org>
Sat, 18 May 2002 11:30:38 +0000
changeset 366 c94b390687d2
parent 365 263374148386
child 367 8a0a806bfe05
Avoid a conflict in the definition of int32
src/hermes/HeadX86.h
src/video/SDL_blit_N.c
src/video/SDL_yuv_sw.c
--- a/src/hermes/HeadX86.h	Fri May 17 17:49:25 2002 +0000
+++ b/src/hermes/HeadX86.h	Sat May 18 11:30:38 2002 +0000
@@ -60,10 +60,10 @@
 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 @@
   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
--- a/src/video/SDL_blit_N.c	Fri May 17 17:49:25 2002 +0000
+++ b/src/video/SDL_blit_N.c	Sat May 18 11:30:38 2002 +0000
@@ -49,7 +49,6 @@
 #define HermesConverterInterface	SDL_BlitInfo
 #define HermesClearInterface		void
 #define STACKCALL
-typedef Uint32 int32;
 
 #include "HeadMMX.h"
 #include "HeadX86.h"
--- a/src/video/SDL_yuv_sw.c	Fri May 17 17:49:25 2002 +0000
+++ b/src/video/SDL_yuv_sw.c	Sat May 18 11:30:38 2002 +0000
@@ -109,7 +109,6 @@
 #define HermesConverterInterface	void
 #define HermesClearInterface		void
 #define STACKCALL
-typedef Uint32 int32;
 
 #include "HeadX86.h"
 #endif