From aa86e05d21d907606cfa95e8548d674ddc980833 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 20 Oct 2013 20:49:36 -0700 Subject: [PATCH] Fixed windows compile --- WhatsNew.txt | 2 ++ src/haptic/windows/SDL_syshaptic.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WhatsNew.txt b/WhatsNew.txt index c3784deab..929414e0a 100644 --- a/WhatsNew.txt +++ b/WhatsNew.txt @@ -1,3 +1,5 @@ This is a list of API changes in SDL's version history. +2.0.1 +* diff --git a/src/haptic/windows/SDL_syshaptic.c b/src/haptic/windows/SDL_syshaptic.c index d7edf0fac..a9f8d8342 100644 --- a/src/haptic/windows/SDL_syshaptic.c +++ b/src/haptic/windows/SDL_syshaptic.c @@ -1567,7 +1567,7 @@ SDL_RunXInputHaptic(void *arg) 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);