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

future-proofing for Microsoft's C++/CX extensions, whereby "generic" is a reserved keyword

Browse source
This commit is contained in:
David Ludwig 2013-04-20 23:05:08 -04:00
parent e4b6ac8025
commit cf8a84626b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/SDL_events.h
View file

@ -124,11 +124,11 @@ typedef enum
/** /**
* \brief Fields shared by every event * \brief Fields shared by every event
*/ */
typedef struct SDL_GenericEvent typedef struct SDL_CommonEvent
{ {
Uint32 type; Uint32 type;
Uint32 timestamp; Uint32 timestamp;
} SDL_GenericEvent; } SDL_CommonEvent;
/** /**
* \brief Window state change event data (event.window.*) * \brief Window state change event data (event.window.*)
@ -464,7 +464,7 @@ typedef struct SDL_SysWMEvent
typedef union SDL_Event typedef union SDL_Event
{ {
Uint32 type; /**< Event type, shared with all events */ Uint32 type; /**< Event type, shared with all events */
SDL_GenericEvent generic; /**< Generic event data */ SDL_CommonEvent common; /**< Common event data */
SDL_WindowEvent window; /**< Window event data */ SDL_WindowEvent window; /**< Window event data */
SDL_KeyboardEvent key; /**< Keyboard event data */ SDL_KeyboardEvent key; /**< Keyboard event data */
SDL_TextEditingEvent edit; /**< Text editing event data */ SDL_TextEditingEvent edit; /**< Text editing event data */

2
src/events/SDL_events.c
View file

@ -365,7 +365,7 @@ int
SDL_PushEvent(SDL_Event * event) SDL_PushEvent(SDL_Event * event)
{ {
SDL_EventWatcher *curr; SDL_EventWatcher *curr;
event->generic.timestamp = SDL_GetTicks(); event->common.timestamp = SDL_GetTicks();
if (SDL_EventOK && !SDL_EventOK(SDL_EventOKParam, event)) { if (SDL_EventOK && !SDL_EventOK(SDL_EventOKParam, event)) {
return 0; return 0;
} }