diff --git a/include/SDL3/SDL_events.h b/include/SDL3/SDL_events.h index 4b1d13917..0fddf1f24 100644 --- a/include/SDL3/SDL_events.h +++ b/include/SDL3/SDL_events.h @@ -828,7 +828,7 @@ typedef enum SDL_ADDEVENT, SDL_PEEKEVENT, SDL_GETEVENT -} SDL_EventAction; +} SDL_eventaction; /** * Check the event queue for messages and optionally return them. @@ -868,7 +868,7 @@ typedef enum * \sa SDL_PumpEvents * \sa SDL_PushEvent */ -extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event *events, int numevents, SDL_EventAction action, Uint32 minType, Uint32 maxType); +extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event *events, int numevents, SDL_eventaction action, Uint32 minType, Uint32 maxType); /* @} */ /** diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h index 7089f7629..aadd2e53c 100644 --- a/src/dynapi/SDL_dynapi_procs.h +++ b/src/dynapi/SDL_dynapi_procs.h @@ -647,7 +647,7 @@ SDL_DYNAPI_PROC(int,SDL_OpenURL,(const char *a),(a),return) SDL_DYNAPI_PROC(SDL_Storage*,SDL_OpenUserStorage,(const char *a, const char *b, SDL_PropertiesID c),(a,b,c),return) SDL_DYNAPI_PROC(int,SDL_PauseAudioDevice,(SDL_AudioDeviceID a),(a),return) SDL_DYNAPI_PROC(int,SDL_PauseHaptic,(SDL_Haptic *a),(a),return) -SDL_DYNAPI_PROC(int,SDL_PeepEvents,(SDL_Event *a, int b, SDL_EventAction c, Uint32 d, Uint32 e),(a,b,c,d,e),return) +SDL_DYNAPI_PROC(int,SDL_PeepEvents,(SDL_Event *a, int b, SDL_eventaction c, Uint32 d, Uint32 e),(a,b,c,d,e),return) SDL_DYNAPI_PROC(SDL_bool,SDL_PenConnected,(SDL_PenID a),(a),return) SDL_DYNAPI_PROC(int,SDL_PlayHapticRumble,(SDL_Haptic *a, float b, Uint32 c),(a,b,c),return) SDL_DYNAPI_PROC(SDL_bool,SDL_PollEvent,(SDL_Event *a),(a),return) diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c index 01c7028d6..93af8aa1f 100644 --- a/src/events/SDL_events.c +++ b/src/events/SDL_events.c @@ -839,7 +839,7 @@ static int SDL_SendWakeupEvent(void) } /* Lock the event queue, take a peep at it, and unlock it */ -static int SDL_PeepEventsInternal(SDL_Event *events, int numevents, SDL_EventAction action, +static int SDL_PeepEventsInternal(SDL_Event *events, int numevents, SDL_eventaction action, Uint32 minType, Uint32 maxType, SDL_bool include_sentinel) { int i, used, sentinels_expected = 0; @@ -904,7 +904,7 @@ static int SDL_PeepEventsInternal(SDL_Event *events, int numevents, SDL_EventAct return used; } -int SDL_PeepEvents(SDL_Event *events, int numevents, SDL_EventAction action, +int SDL_PeepEvents(SDL_Event *events, int numevents, SDL_eventaction action, Uint32 minType, Uint32 maxType) { return SDL_PeepEventsInternal(events, numevents, action, minType, maxType, SDL_FALSE);