src/haptic/darwin/SDL_syshaptic.c
branchgsoc2008_force_feedback
changeset 2639 668fee3b268a
parent 2637 2f826c229d77
child 2641 e1e1be935178
     1.1 --- a/src/haptic/darwin/SDL_syshaptic.c	Sun Aug 10 19:47:02 2008 +0000
     1.2 +++ b/src/haptic/darwin/SDL_syshaptic.c	Sun Aug 10 19:53:58 2008 +0000
     1.3 @@ -162,6 +162,11 @@
     1.4     }
     1.5     /* IOServiceGetMatchingServices consumes dictionary. */
     1.6  
     1.7 +   if (!iter) { /* No iterator. */
     1.8 +      numhaptics = 0;
     1.9 +      return 0;
    1.10 +   }
    1.11 +
    1.12     numhaptics = 0;
    1.13     while ((device = IOIteratorNext(iter)) != IO_OBJECT_NULL) {
    1.14  
    1.15 @@ -459,7 +464,8 @@
    1.16  int
    1.17  SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
    1.18  {
    1.19 -   if (IOObjectIsEqualTo(haptic->hwdata->device, joystick->hwdata->ffservice))
    1.20 +   if (IOObjectIsEqualTo((io_object_t) haptic->hwdata->device,
    1.21 +                                       joystick->hwdata->ffservice))
    1.22        return 1;
    1.23     return 0;
    1.24  }