pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build issue on Win/Haiku.

Browse source 
This fixes a build issue with C variable declarations in my refcounting
       change.
This commit is contained in:
Jørgen P. Tjernø 2013-02-12 12:18:46 -08:00
parent f85aeb98c7
commit 564d47f878
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/SDL.c
View file

@ -48,7 +48,8 @@ static SDL_bool SDL_bInMainQuit = SDL_FALSE;
static Uint8 SDL_SubsystemRefCount[ 32 ]; static Uint8 SDL_SubsystemRefCount[ 32 ];
/* Private helper to increment a subsystem's ref counter. */ /* Private helper to increment a subsystem's ref counter. */
static void SDL_PrivateSubsystemRefCountIncr(Uint32 subsystem) static void
SDL_PrivateSubsystemRefCountIncr(Uint32 subsystem)
{ {
int subsystem_index = SDL_MostSignificantBitIndex32(subsystem); int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
SDL_assert(SDL_SubsystemRefCount[subsystem_index] < 255); SDL_assert(SDL_SubsystemRefCount[subsystem_index] < 255);
@ -56,7 +57,8 @@ static void SDL_PrivateSubsystemRefCountIncr(Uint32 subsystem)
} }
/* Private helper to decrement a subsystem's ref counter. */ /* Private helper to decrement a subsystem's ref counter. */
void SDL_PrivateSubsystemRefCountDecr(Uint32 subsystem) static void
SDL_PrivateSubsystemRefCountDecr(Uint32 subsystem)
{ {
int subsystem_index = SDL_MostSignificantBitIndex32(subsystem); int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
if (SDL_SubsystemRefCount[subsystem_index] > 0) { if (SDL_SubsystemRefCount[subsystem_index] > 0) {
@ -68,11 +70,12 @@ void SDL_PrivateSubsystemRefCountDecr(Uint32 subsystem)
static SDL_bool static SDL_bool
SDL_PrivateShouldInitSubsystem(Uint32 flags, Uint32 subsystem) SDL_PrivateShouldInitSubsystem(Uint32 flags, Uint32 subsystem)
{ {
int subsystem_index;
if ((flags & subsystem) == 0) { if ((flags & subsystem) == 0) {
return SDL_FALSE; return SDL_FALSE;
} }
int subsystem_index = SDL_MostSignificantBitIndex32(subsystem); subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
SDL_assert(SDL_SubsystemRefCount[subsystem_index] < 255); SDL_assert(SDL_SubsystemRefCount[subsystem_index] < 255);
return (SDL_SubsystemRefCount[subsystem_index] == 0); return (SDL_SubsystemRefCount[subsystem_index] == 0);
} }