Skip to content

L
libSDL
Commit 37e65f47 authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Avoid a conflict in the definition of int32 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40367
parent 7d917ae1
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 10 deletions
src/hermes/HeadX86.h
View file @ 37e65f47
...@@ -60,10 +60,10 @@ void ConvertX86pI8_32(); ...@@ -60,10 +60,10 @@ void ConvertX86pI8_32();
void ConvertX86pI8_24(); void ConvertX86pI8_24();
void ConvertX86pI8_16(); void ConvertX86pI8_16();
extern int32 ConvertX86p16_32RGB888_LUT_X86[512]; extern int ConvertX86p16_32RGB888_LUT_X86[512];
extern int32 ConvertX86p16_32BGR888_LUT_X86[512]; extern int ConvertX86p16_32BGR888_LUT_X86[512];
extern int32 ConvertX86p16_32RGBA888_LUT_X86[512]; extern int ConvertX86p16_32RGBA888_LUT_X86[512];
extern int32 ConvertX86p16_32BGRA888_LUT_X86[512]; extern int ConvertX86p16_32BGRA888_LUT_X86[512];
#ifdef __cplusplus #ifdef __cplusplus
} }
...@@ -124,10 +124,10 @@ extern int32 ConvertX86p16_32BGRA888_LUT_X86[512]; ...@@ -124,10 +124,10 @@ extern int32 ConvertX86p16_32BGRA888_LUT_X86[512];
void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24"))); void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24")));
void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16"))); void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16")));
extern int32 ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86"))); extern int 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 int 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 int 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_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86")));
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
......
src/video/SDL_blit_N.c
View file @ 37e65f47
...@@ -49,7 +49,6 @@ static char rcsid = ...@@ -49,7 +49,6 @@ static char rcsid =
#define HermesConverterInterface SDL_BlitInfo #define HermesConverterInterface SDL_BlitInfo
#define HermesClearInterface void #define HermesClearInterface void
#define STACKCALL #define STACKCALL
typedef Uint32 int32;
#include "HeadMMX.h" #include "HeadMMX.h"
#include "HeadX86.h" #include "HeadX86.h"
......
src/video/SDL_yuv_sw.c
View file @ 37e65f47
...@@ -109,7 +109,6 @@ static char rcsid = ...@@ -109,7 +109,6 @@ static char rcsid =
#define HermesConverterInterface void #define HermesConverterInterface void
#define HermesClearInterface void #define HermesClearInterface void
#define STACKCALL #define STACKCALL
typedef Uint32 int32;
#include "HeadX86.h" #include "HeadX86.h"
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment