Clean up whitespace in Hooks-darwin.cpp

develop
lethosor 2015-01-05 15:57:34 -05:00
parent dd9cb70ad3
commit e7ee29b1e3
1 changed files with 10 additions and 7 deletions

@ -49,16 +49,19 @@ typedef struct interpose_s
#include "Hooks.h" #include "Hooks.h"
#include <iostream> #include <iostream>
/*static const interpose_t interposers[] __attribute__ ((section("__DATA, __interpose"))) = /*static const interpose_t interposers[] __attribute__ ((section("__DATA, __interpose"))) =
{ {
{ (void *)DFH_SDL_Init, (void *)SDL_Init }, { (void *)DFH_SDL_Init, (void *)SDL_Init },
{ (void *)DFH_SDL_PollEvent, (void *)SDL_PollEvent }, { (void *)DFH_SDL_PollEvent, (void *)SDL_PollEvent },
{ (void *)DFH_SDL_Quit, (void *)SDL_Quit }, { (void *)DFH_SDL_Quit, (void *)SDL_Quit },
{ (void *)DFH_SDL_NumJoysticks, (void *)SDL_NumJoysticks }, { (void *)DFH_SDL_NumJoysticks, (void *)SDL_NumJoysticks },
};*/ };*/
#define DYLD_INTERPOSE(_replacment,_replacee) __attribute__((used)) static struct{ const void* replacment; const void* replacee; } _interpose_##_replacee __attribute__ ((section ("__DATA,__interpose"))) = { (const void*)(unsigned long)&_replacment, (const void*)(unsigned long)&_replacee }; #define DYLD_INTERPOSE(_replacment,_replacee) \
__attribute__((used)) static struct{ const void* replacment; const void* replacee; } \
_interpose_##_replacee __attribute__ ((section ("__DATA,__interpose"))) = \
{ (const void*)(unsigned long)&_replacment, (const void*)(unsigned long)&_replacee };
DYLD_INTERPOSE(DFH_SDL_Init,SDL_Init); DYLD_INTERPOSE(DFH_SDL_Init,SDL_Init);
DYLD_INTERPOSE(DFH_SDL_PollEvent,SDL_PollEvent); DYLD_INTERPOSE(DFH_SDL_PollEvent,SDL_PollEvent);
@ -94,7 +97,7 @@ DFhackCExport void DFH_SDL_Quit(void)
{ {
_SDL_Quit(); _SDL_Quit();
}*/ }*/
SDL_Quit(); SDL_Quit();
} }
@ -170,10 +173,10 @@ DFhackCExport int DFH_SDL_Init(uint32_t flags)
fprintf(stderr,"dfhack: something went horribly wrong\n"); fprintf(stderr,"dfhack: something went horribly wrong\n");
exit(1); exit(1);
} }
DFHack::Core & c = DFHack::Core::getInstance(); DFHack::Core & c = DFHack::Core::getInstance();
//c.Init(); //c.Init();
//int ret = _SDL_Init(flags); //int ret = _SDL_Init(flags);
int ret = SDL_Init(flags); int ret = SDL_Init(flags);
return ret; return ret;
@ -270,4 +273,4 @@ DFhackCExport int DFH_SDL_UpperBlit(DFHack::DFSDL_Surface* src, DFHack::DFSDL_Re
} }
return SDL_UpperBlit(src, srcrect, dst, dstrect); return SDL_UpperBlit(src, srcrect, dst, dstrect);
} }