From 2011e3d29b7c401551eca5e537d3e7be3e34582f 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.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403624
---
 include/SDL_events.h | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 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,20 +313,6 @@ typedef struct SDL_SysWMEvent
     SDL_SysWMmsg *msg;  /**< driver dependent data, defined in SDL_syswm.h */
 } SDL_SysWMEvent;
 
-/* Typedefs for backwards compatibility */
-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;
@@ -336,6 +322,23 @@ typedef struct SDL_ProximityEvent
     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;
+#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;