--- a/include/SDL_events.h	Mon May 29 03:53:21 2006 +0000
+++ b/include/SDL_events.h	Mon May 29 04:04:35 2006 +0000
@@ -89,28 +89,26 @@
 #define SDL_EVENTMASK(X)	(1<<(X))
 typedef enum
 {
-    SDL_WINDOWEVENTMASK = SDL_EVENTMASK (SDL_WINDOWEVENT),
-    SDL_KEYDOWNMASK = SDL_EVENTMASK (SDL_KEYDOWN),
-    SDL_KEYUPMASK = SDL_EVENTMASK (SDL_KEYUP),
-    SDL_KEYEVENTMASK = SDL_EVENTMASK (SDL_KEYDOWN) |
-        SDL_EVENTMASK (SDL_KEYUP),
-    SDL_MOUSEMOTIONMASK = SDL_EVENTMASK (SDL_MOUSEMOTION),
-    SDL_MOUSEBUTTONDOWNMASK = SDL_EVENTMASK (SDL_MOUSEBUTTONDOWN),
-    SDL_MOUSEBUTTONUPMASK = SDL_EVENTMASK (SDL_MOUSEBUTTONUP),
-    SDL_MOUSEEVENTMASK = SDL_EVENTMASK (SDL_MOUSEMOTION) |
-        SDL_EVENTMASK (SDL_MOUSEBUTTONDOWN) |
-        SDL_EVENTMASK (SDL_MOUSEBUTTONUP),
-    SDL_JOYAXISMOTIONMASK = SDL_EVENTMASK (SDL_JOYAXISMOTION),
-    SDL_JOYBALLMOTIONMASK = SDL_EVENTMASK (SDL_JOYBALLMOTION),
-    SDL_JOYHATMOTIONMASK = SDL_EVENTMASK (SDL_JOYHATMOTION),
-    SDL_JOYBUTTONDOWNMASK = SDL_EVENTMASK (SDL_JOYBUTTONDOWN),
-    SDL_JOYBUTTONUPMASK = SDL_EVENTMASK (SDL_JOYBUTTONUP),
-    SDL_JOYEVENTMASK = SDL_EVENTMASK (SDL_JOYAXISMOTION) |
-        SDL_EVENTMASK (SDL_JOYBALLMOTION) |
-        SDL_EVENTMASK (SDL_JOYHATMOTION) |
-        SDL_EVENTMASK (SDL_JOYBUTTONDOWN) | SDL_EVENTMASK (SDL_JOYBUTTONUP),
-    SDL_QUITMASK = SDL_EVENTMASK (SDL_QUIT),
-    SDL_SYSWMEVENTMASK = SDL_EVENTMASK (SDL_SYSWMEVENT)
+    SDL_WINDOWEVENTMASK = SDL_EVENTMASK(SDL_WINDOWEVENT),
+    SDL_KEYDOWNMASK = SDL_EVENTMASK(SDL_KEYDOWN),
+    SDL_KEYUPMASK = SDL_EVENTMASK(SDL_KEYUP),
+    SDL_KEYEVENTMASK = SDL_EVENTMASK(SDL_KEYDOWN) | SDL_EVENTMASK(SDL_KEYUP),
+    SDL_MOUSEMOTIONMASK = SDL_EVENTMASK(SDL_MOUSEMOTION),
+    SDL_MOUSEBUTTONDOWNMASK = SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN),
+    SDL_MOUSEBUTTONUPMASK = SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
+    SDL_MOUSEEVENTMASK = SDL_EVENTMASK(SDL_MOUSEMOTION) |
+        SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN) | SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
+    SDL_JOYAXISMOTIONMASK = SDL_EVENTMASK(SDL_JOYAXISMOTION),
+    SDL_JOYBALLMOTIONMASK = SDL_EVENTMASK(SDL_JOYBALLMOTION),
+    SDL_JOYHATMOTIONMASK = SDL_EVENTMASK(SDL_JOYHATMOTION),
+    SDL_JOYBUTTONDOWNMASK = SDL_EVENTMASK(SDL_JOYBUTTONDOWN),
+    SDL_JOYBUTTONUPMASK = SDL_EVENTMASK(SDL_JOYBUTTONUP),
+    SDL_JOYEVENTMASK = SDL_EVENTMASK(SDL_JOYAXISMOTION) |
+        SDL_EVENTMASK(SDL_JOYBALLMOTION) |
+        SDL_EVENTMASK(SDL_JOYHATMOTION) |
+        SDL_EVENTMASK(SDL_JOYBUTTONDOWN) | SDL_EVENTMASK(SDL_JOYBUTTONUP),
+    SDL_QUITMASK = SDL_EVENTMASK(SDL_QUIT),
+    SDL_SYSWMEVENTMASK = SDL_EVENTMASK(SDL_SYSWMEVENT)
 } SDL_EventMask;
 #define SDL_ALLEVENTS		0xFFFFFFFF
 
@@ -299,7 +297,7 @@
    This function updates the event queue and internal input device state.
    This should only be run in the thread that sets the video mode.
 */
-extern DECLSPEC void SDLCALL SDL_PumpEvents (void);
+extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
 
 /* Checks the event queue for messages and optionally returns them.
    If 'action' is SDL_ADDEVENT, up to 'numevents' events will be added to
@@ -320,27 +318,27 @@
     SDL_GETEVENT
 } SDL_eventaction;
 /* */
-extern DECLSPEC int SDLCALL SDL_PeepEvents (SDL_Event * events, int numevents,
-                                            SDL_eventaction action,
-                                            Uint32 mask);
+extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents,
+                                           SDL_eventaction action,
+                                           Uint32 mask);
 
 /* Polls for currently pending events, and returns 1 if there are any pending
    events, or 0 if there are none available.  If 'event' is not NULL, the next
    event is removed from the queue and stored in that area.
  */
-extern DECLSPEC int SDLCALL SDL_PollEvent (SDL_Event * event);
+extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event * event);
 
 /* Waits indefinitely for the next available event, returning 1, or 0 if there
    was an error while waiting for events.  If 'event' is not NULL, the next
    event is removed from the queue and stored in that area.
  */
-extern DECLSPEC int SDLCALL SDL_WaitEvent (SDL_Event * event);
+extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event * event);
 
 /* Add an event to the event queue.
    This function returns 0 on success, or -1 if the event queue was full
    or there was some other error.
  */
-extern DECLSPEC int SDLCALL SDL_PushEvent (SDL_Event * event);
+extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event * event);
 
 /*
   This function sets up a filter to process all events before they
@@ -365,13 +363,13 @@
   If the quit event is generated by an interrupt signal, it will bypass the
   internal queue and be delivered to the application at the next event poll.
 */
-extern DECLSPEC void SDLCALL SDL_SetEventFilter (SDL_EventFilter filter);
+extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter);
 
 /*
   Return the current event filter - can be used to "chain" filters.
   If there is no event filter set, this function returns NULL.
 */
-extern DECLSPEC SDL_EventFilter SDLCALL SDL_GetEventFilter (void);
+extern DECLSPEC SDL_EventFilter SDLCALL SDL_GetEventFilter(void);
 
 /*
   This function allows you to set the state of processing certain events.
@@ -385,7 +383,7 @@
 #define SDL_IGNORE	 0
 #define SDL_DISABLE	 0
 #define SDL_ENABLE	 1
-extern DECLSPEC Uint8 SDLCALL SDL_EventState (Uint8 type, int state);
+extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint8 type, int state);
 
 
 /* Ends C function definitions when using C++ */