From bd2e129b1575a97e4a9be4129790ba381fbf4554 Mon Sep 17 00:00:00 2001
From: Bob Pendleton <bob@pendleton.com>
Date: Fri, 5 Jun 2009 23:36:00 +0000
Subject: [PATCH] Added a #ifndef SDL_NO_COMPAT around SDL_ActiveEvent and
 SDL_ResizeEvent so that code that has a #defien SDL_NO_COMPAT before the
 #include SDL.h with not be able to use these obsolete events.

---
 include/SDL_events.h | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/include/SDL_events.h b/include/SDL_events.h
index 34c2a1242..f613bb27b 100644
--- a/include/SDL_events.h
+++ b/include/SDL_events.h
@@ -313,28 +313,31 @@ typedef struct SDL_SysWMEvent
     SDL_SysWMmsg *msg;  /**< driver dependent data, defined in SDL_syswm.h */
 } SDL_SysWMEvent;
 
+typedef struct SDL_ProximityEvent
+{
+    Uint8 type;
+    Uint8 which;
+    int cursor;
+    int x;
+    int y;
+} SDL_ProximityEvent;
+
 /* Typedefs for backwards compatibility */
+#ifndef SDL_NO_COMPAT
 typedef struct SDL_ActiveEvent
 {
     Uint8 type;
     Uint8 gain;
     Uint8 state;
 } SDL_ActiveEvent;
+
 typedef struct SDL_ResizeEvent
 {
     Uint8 type;
     int w;
     int h;
 } SDL_ResizeEvent;
-
-typedef struct SDL_ProximityEvent
-{
-    Uint8 type;
-    Uint8 which;
-    int cursor;
-    int x;
-    int y;
-} SDL_ProximityEvent;
+#endif
 
 /**
  * \union SDL_Event
@@ -360,8 +363,10 @@ typedef union SDL_Event
     SDL_ProximityEvent proximity;   /**< Proximity In or Out event */
 
     /* Temporarily here for backwards compatibility */
+#ifndef SDL_NO_COMPAT
     SDL_ActiveEvent active;
     SDL_ResizeEvent resize;
+#endif
 } SDL_Event;