encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 3744 - missing SDLCALL in several functions 

Ozkan Sezer

The attached patch adds missing SDLCALL to several functions, so that
they properly match the headers as intended.
This commit is contained in:
Sam Lantinga 2017-08-13 21:06:52 -07:00
parent e54eede265
commit ca5c304814
11 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SDL_assert.c
View File

@ -49,7 +49,7 @@
#endif #endif
static SDL_assert_state static SDL_assert_state SDLCALL
SDL_PromptAssertion(const SDL_assert_data *data, void *userdata); SDL_PromptAssertion(const SDL_assert_data *data, void *userdata);
/* /*
@ -141,7 +141,7 @@ static SDL_NORETURN void SDL_AbortAssertion(void)
} }
static SDL_assert_state static SDL_assert_state SDLCALL
SDL_PromptAssertion(const SDL_assert_data *data, void *userdata) SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
{ {
#ifdef __WIN32__ #ifdef __WIN32__

8
src/events/SDL_windowevents.c
View File

@ -28,7 +28,7 @@
#include "../video/SDL_sysvideo.h" #include "../video/SDL_sysvideo.h"
static int static int SDLCALL
RemovePendingResizedEvents(void * userdata, SDL_Event *event) RemovePendingResizedEvents(void * userdata, SDL_Event *event)
{ {
SDL_Event *new_event = (SDL_Event *)userdata; SDL_Event *new_event = (SDL_Event *)userdata;
@ -42,7 +42,7 @@ RemovePendingResizedEvents(void * userdata, SDL_Event *event)
return 1; return 1;
} }
static int static int SDLCALL
RemovePendingSizeChangedEvents(void * userdata, SDL_Event *event) RemovePendingSizeChangedEvents(void * userdata, SDL_Event *event)
{ {
SDL_Event *new_event = (SDL_Event *)userdata; SDL_Event *new_event = (SDL_Event *)userdata;
@ -56,7 +56,7 @@ RemovePendingSizeChangedEvents(void * userdata, SDL_Event *event)
return 1; return 1;
} }
static int static int SDLCALL
RemovePendingMoveEvents(void * userdata, SDL_Event *event) RemovePendingMoveEvents(void * userdata, SDL_Event *event)
{ {
SDL_Event *new_event = (SDL_Event *)userdata; SDL_Event *new_event = (SDL_Event *)userdata;
@ -70,7 +70,7 @@ RemovePendingMoveEvents(void * userdata, SDL_Event *event)
return 1; return 1;
} }
static int static int SDLCALL
RemovePendingExposedEvents(void * userdata, SDL_Event *event) RemovePendingExposedEvents(void * userdata, SDL_Event *event)
{ {
SDL_Event *new_event = (SDL_Event *)userdata; SDL_Event *new_event = (SDL_Event *)userdata;

2
src/joystick/SDL_gamecontroller.c
View File

@ -333,7 +333,7 @@ static void HandleJoystickHat(SDL_GameController *gamecontroller, int hat, Uint8
/* /*
* Event filter to fire controller events from joystick ones * Event filter to fire controller events from joystick ones
*/ */
static int SDL_GameControllerEventWatcher(void *userdata, SDL_Event * event) static int SDLCALL SDL_GameControllerEventWatcher(void *userdata, SDL_Event * event)
{ {
switch(event->type) { switch(event->type) {
case SDL_JOYAXISMOTION: case SDL_JOYAXISMOTION:

2
src/render/SDL_render.c
View File

@ -102,7 +102,7 @@ SDL_GetRenderDriverInfo(int index, SDL_RendererInfo * info)
#endif #endif
} }
static int static int SDLCALL
SDL_RendererEventWatch(void *userdata, SDL_Event *event) SDL_RendererEventWatch(void *userdata, SDL_Event *event)
{ {
SDL_Renderer *renderer = (SDL_Renderer *)userdata; SDL_Renderer *renderer = (SDL_Renderer *)userdata;

2
src/timer/SDL_timer.c
View File

@ -97,7 +97,7 @@ SDL_AddTimerInternal(SDL_TimerData *data, SDL_Timer *timer)
timer->next = curr; timer->next = curr;
} }
static int static int SDLCALL
SDL_TimerThread(void *_data) SDL_TimerThread(void *_data)
{ {
SDL_TimerData *data = (SDL_TimerData *)_data; SDL_TimerData *data = (SDL_TimerData *)_data;

8
test/testatomic.c
View File

@ -117,7 +117,7 @@ static SDL_atomic_t threadsRunning;
static SDL_sem *threadDone; static SDL_sem *threadDone;
static static
int adder(void* junk) int SDLCALL adder(void* junk)
{ {
unsigned long N=NInter; unsigned long N=NInter;
SDL_Log("Thread subtracting %d %lu times\n",CountInc,N); SDL_Log("Thread subtracting %d %lu times\n",CountInc,N);
@ -495,7 +495,7 @@ typedef struct
char padding[SDL_CACHELINE_SIZE-(sizeof(SDL_EventQueue*)+sizeof(int)*NUM_WRITERS+sizeof(int)+sizeof(SDL_bool))%SDL_CACHELINE_SIZE]; char padding[SDL_CACHELINE_SIZE-(sizeof(SDL_EventQueue*)+sizeof(int)*NUM_WRITERS+sizeof(int)+sizeof(SDL_bool))%SDL_CACHELINE_SIZE];
} ReaderData; } ReaderData;
static int FIFO_Writer(void* _data) static int SDLCALL FIFO_Writer(void* _data)
{ {
WriterData *data = (WriterData *)_data; WriterData *data = (WriterData *)_data;
SDL_EventQueue *queue = data->queue; SDL_EventQueue *queue = data->queue;
@ -530,7 +530,7 @@ static int FIFO_Writer(void* _data)
return 0; return 0;
} }
static int FIFO_Reader(void* _data) static int SDLCALL FIFO_Reader(void* _data)
{ {
ReaderData *data = (ReaderData *)_data; ReaderData *data = (ReaderData *)_data;
SDL_EventQueue *queue = data->queue; SDL_EventQueue *queue = data->queue;
@ -570,7 +570,7 @@ static int FIFO_Reader(void* _data)
#ifdef TEST_SPINLOCK_FIFO #ifdef TEST_SPINLOCK_FIFO
/* This thread periodically locks the queue for no particular reason */ /* This thread periodically locks the queue for no particular reason */
static int FIFO_Watcher(void* _data) static int SDLCALL FIFO_Watcher(void* _data)
{ {
SDL_EventQueue *queue = (SDL_EventQueue *)_data; SDL_EventQueue *queue = (SDL_EventQueue *)_data;

2
test/testautomation_audio.c
View File

@ -46,7 +46,7 @@ int _audio_testCallbackLength;
/* Test callback function */ /* Test callback function */
void _audio_testCallback(void *userdata, Uint8 *stream, int len) void SDLCALL _audio_testCallback(void *userdata, Uint8 *stream, int len)
{ {
/* track that callback was called */ /* track that callback was called */
_audio_testCallbackCounter++; _audio_testCallbackCounter++;

2
test/testautomation_events.c
View File

@ -25,7 +25,7 @@ int _userdataValue1 = 1;
int _userdataValue2 = 2; int _userdataValue2 = 2;
/* Event filter that sets some flags and optionally checks userdata */ /* Event filter that sets some flags and optionally checks userdata */
int _events_sampleNullEventFilter(void *userdata, SDL_Event *event) int SDLCALL _events_sampleNullEventFilter(void *userdata, SDL_Event *event)
{ {
_eventFilterCalled = 1; _eventFilterCalled = 1;

2
test/testautomation_timer.c
View File

@ -104,7 +104,7 @@ timer_delayAndGetTicks(void *arg)
} }
/* Test callback */ /* Test callback */
Uint32 _timerTestCallback(Uint32 interval, void *param) Uint32 SDLCALL _timerTestCallback(Uint32 interval, void *param)
{ {
_timerCallbackCalled = 1; _timerCallbackCalled = 1;

2
test/testhittesting.c
View File

@ -14,7 +14,7 @@ const SDL_Rect drag_areas[] = {
static const SDL_Rect *areas = drag_areas; static const SDL_Rect *areas = drag_areas;
static int numareas = SDL_arraysize(drag_areas); static int numareas = SDL_arraysize(drag_areas);
static SDL_HitTestResult static SDL_HitTestResult SDLCALL
hitTest(SDL_Window *window, const SDL_Point *pt, void *data) hitTest(SDL_Window *window, const SDL_Point *pt, void *data)
{ {
int i; int i;

2
test/testmessage.c
View File

@ -25,7 +25,7 @@ quit(int rc)
exit(rc); exit(rc);
} }
static int static int SDLCALL
button_messagebox(void *eventNumber) button_messagebox(void *eventNumber)
{ {
const SDL_MessageBoxButtonData buttons[] = { const SDL_MessageBoxButtonData buttons[] = {