Mercurial Mercurial > SDL / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Avoid a conflict in the definition of int32
authorSam Lantinga
Sat, 18 May 2002 11:30:38 +0000
changeset 366c94b390687d2
parent 365 263374148386
child 367 8a0a806bfe05
Avoid a conflict in the definition of int32
src/hermes/HeadX86.h file | annotate | diff | comparison | revisions
src/video/SDL_blit_N.c file | annotate | diff | comparison | revisions
src/video/SDL_yuv_sw.c file | annotate | diff | comparison | revisions 
     1.1 --- a/src/hermes/HeadX86.h	Fri May 17 17:49:25 2002 +0000
     1.2 +++ b/src/hermes/HeadX86.h	Sat May 18 11:30:38 2002 +0000
     1.3 @@ -60,10 +60,10 @@
     1.4  void ConvertX86pI8_24();
     1.5  void ConvertX86pI8_16();
     1.6  
     1.7 -extern int32 ConvertX86p16_32RGB888_LUT_X86[512];
     1.8 -extern int32 ConvertX86p16_32BGR888_LUT_X86[512];
     1.9 -extern int32 ConvertX86p16_32RGBA888_LUT_X86[512];
    1.10 -extern int32 ConvertX86p16_32BGRA888_LUT_X86[512];
    1.11 +extern int ConvertX86p16_32RGB888_LUT_X86[512];
    1.12 +extern int ConvertX86p16_32BGR888_LUT_X86[512];
    1.13 +extern int ConvertX86p16_32RGBA888_LUT_X86[512];
    1.14 +extern int ConvertX86p16_32BGRA888_LUT_X86[512];
    1.15    
    1.16  #ifdef __cplusplus
    1.17  }
    1.18 @@ -124,10 +124,10 @@
    1.19    void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24")));
    1.20    void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16")));
    1.21  
    1.22 -  extern int32 ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86")));
    1.23 -  extern int32 ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86")));
    1.24 -  extern int32 ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86")));
    1.25 -  extern int32 ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
    1.26 +  extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86")));
    1.27 +  extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86")));
    1.28 +  extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86")));
    1.29 +  extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
    1.30  #endif
    1.31  
    1.32    #ifdef __cplusplus

     2.1 --- a/src/video/SDL_blit_N.c	Fri May 17 17:49:25 2002 +0000
     2.2 +++ b/src/video/SDL_blit_N.c	Sat May 18 11:30:38 2002 +0000
     2.3 @@ -49,7 +49,6 @@
     2.4  #define HermesConverterInterface	SDL_BlitInfo
     2.5  #define HermesClearInterface		void
     2.6  #define STACKCALL
     2.7 -typedef Uint32 int32;
     2.8  
     2.9  #include "HeadMMX.h"
    2.10  #include "HeadX86.h"

     3.1 --- a/src/video/SDL_yuv_sw.c	Fri May 17 17:49:25 2002 +0000
     3.2 +++ b/src/video/SDL_yuv_sw.c	Sat May 18 11:30:38 2002 +0000
     3.3 @@ -109,7 +109,6 @@
     3.4  #define HermesConverterInterface	void
     3.5  #define HermesClearInterface		void
     3.6  #define STACKCALL
     3.7 -typedef Uint32 int32;
     3.8  
     3.9  #include "HeadX86.h"
    3.10  #endif
SDL