From cf8a84626b86458721519a5dcde683b677c022f2 Mon Sep 17 00:00:00 2001
From: David Ludwig <dludwig@pobox.com>
Date: Sat, 20 Apr 2013 23:05:08 -0400
Subject: [PATCH] future-proofing for Microsoft's C++/CX extensions, whereby
 "generic" is a reserved keyword

---
 include/SDL_events.h    | 6 +++---
 src/events/SDL_events.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/SDL_events.h b/include/SDL_events.h
index 205467e9a..fe742b237 100644
--- a/include/SDL_events.h
+++ b/include/SDL_events.h
@@ -124,11 +124,11 @@ typedef enum
 /**
  *  \brief Fields shared by every event
  */
-typedef struct SDL_GenericEvent
+typedef struct SDL_CommonEvent
 {
     Uint32 type;
     Uint32 timestamp;
-} SDL_GenericEvent;
+} SDL_CommonEvent;
     
 /**
  *  \brief Window state change event data (event.window.*)
@@ -464,7 +464,7 @@ typedef struct SDL_SysWMEvent
 typedef union SDL_Event
 {
     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_KeyboardEvent key;          /**< Keyboard event data */
     SDL_TextEditingEvent edit;      /**< Text editing event data */
diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c
index 75aed9221..ecba3bb5b 100644
--- a/src/events/SDL_events.c
+++ b/src/events/SDL_events.c
@@ -365,7 +365,7 @@ int
 SDL_PushEvent(SDL_Event * event)
 {
     SDL_EventWatcher *curr;
-    event->generic.timestamp = SDL_GetTicks();
+    event->common.timestamp = SDL_GetTicks();
     if (SDL_EventOK && !SDL_EventOK(SDL_EventOKParam, event)) {
         return 0;
     }