# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1174257564 0
# Node ID b0048df1701a9c3fb674ccc466e7da887145c1cf
# Parent  87256df8783715731d0e9e6d84c429f112ea49f3
Merged r2992:2993 from branches/SDL-1.2: Mac OS X multi-axis joystick support.

diff -r 87256df87837 -r b0048df1701a src/joystick/darwin/SDL_sysjoystick.c
--- a/src/joystick/darwin/SDL_sysjoystick.c	Wed Mar 14 01:10:43 2007 +0000
+++ b/src/joystick/darwin/SDL_sysjoystick.c	Sun Mar 18 22:39:24 2007 +0000
@@ -690,9 +690,10 @@
 */
 
         /* Filter device list to non-keyboard/mouse stuff */
-        if ((device->usagePage != kHIDPage_GenericDesktop) ||
-            ((device->usage != kHIDUsage_GD_Joystick &&
-              device->usage != kHIDUsage_GD_GamePad))) {
+        if ( (device->usagePage != kHIDPage_GenericDesktop) ||
+             ((device->usage != kHIDUsage_GD_Joystick &&
+               device->usage != kHIDUsage_GD_GamePad &&
+               device->usage != kHIDUsage_GD_MultiAxisController)) ) {
 
             /* release memory for the device */
             HIDDisposeDevice(&device);