# HG changeset patch # User Sam Lantinga # Date 1382327376 25200 # Node ID 170c9f4c3c280f2497a56bf79439f2c8ef0584c4 # Parent 6388f5229bb7880ccdd10183e7229af915c36bd3 Fixed windows compile diff -r 6388f5229bb7 -r 170c9f4c3c28 WhatsNew.txt --- a/WhatsNew.txt Sun Oct 20 20:42:55 2013 -0700 +++ b/WhatsNew.txt Sun Oct 20 20:49:36 2013 -0700 @@ -1,3 +1,5 @@ This is a list of API changes in SDL's version history. +2.0.1 +* diff -r 6388f5229bb7 -r 170c9f4c3c28 src/haptic/windows/SDL_syshaptic.c --- a/src/haptic/windows/SDL_syshaptic.c Sun Oct 20 20:42:55 2013 -0700 +++ b/src/haptic/windows/SDL_syshaptic.c Sun Oct 20 20:49:36 2013 -0700 @@ -1567,7 +1567,7 @@ SDL_LockMutex(hwdata->mutex); /* If we're currently running and need to stop... */ if (hwdata->stopTicks) { - if ((hwdata->stopTicks != SDL_HAPTIC_INFINITY) && SDL_TIMESTAMP_PASSED(SDL_GetTicks(), hwdata->stopTicks)) { + if ((hwdata->stopTicks != SDL_HAPTIC_INFINITY) && SDL_TICKS_PASSED(SDL_GetTicks(), hwdata->stopTicks)) { XINPUT_VIBRATION vibration = { 0, 0 }; hwdata->stopTicks = 0; XINPUTSETSTATE(hwdata->userid, &vibration);