From 3c8d93e091c23a6f0db157c2a2e30f187ce5b263 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Tue, 1 Apr 2008 03:55:02 +0000 Subject: Change a #define constant that conflicts with a mingw definition. Change "WAIT_*" to "OBJ_WAIT_*". git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16906 a1c6a512-1295-4272-9138-f99709370657 --- firmware/kernel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'firmware/kernel.c') diff --git a/firmware/kernel.c b/firmware/kernel.c index 439aea584a..1882855985 100644 --- a/firmware/kernel.c +++ b/firmware/kernel.c @@ -1386,7 +1386,7 @@ void wakeup_init(struct wakeup *w) /* Wait for a signal blocking indefinitely or for a specified period */ int wakeup_wait(struct wakeup *w, int timeout) { - int ret = WAIT_SUCCEEDED; /* Presume success */ + int ret = OBJ_WAIT_SUCCEEDED; /* Presume success */ int oldlevel = disable_irq_save(); corelock_lock(&w->cl); @@ -1413,7 +1413,8 @@ int wakeup_wait(struct wakeup *w, int timeout) if(w->signalled == 0) { /* Timed-out or failed */ - ret = (timeout != TIMEOUT_BLOCK) ? WAIT_TIMEDOUT : WAIT_FAILED; + ret = (timeout != TIMEOUT_BLOCK) ? + OBJ_WAIT_TIMEDOUT : OBJ_WAIT_FAILED; } w->signalled = 0; /* Reset */ -- cgit v1.2.3