diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2008-04-01 03:55:02 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2008-04-01 03:55:02 +0000 |
| commit | 3c8d93e091c23a6f0db157c2a2e30f187ce5b263 (patch) | |
| tree | 2f9aff647c24a682e7f90ace7b6c6a7922c96b57 /firmware/kernel.c | |
| parent | 5e0435b0d933f4780be2e946b77ee0f4f399eaad (diff) | |
| download | rockbox-3c8d93e091c23a6f0db157c2a2e30f187ce5b263.tar.gz rockbox-3c8d93e091c23a6f0db157c2a2e30f187ce5b263.zip | |
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
Diffstat (limited to 'firmware/kernel.c')
| -rw-r--r-- | firmware/kernel.c | 5 |
1 files changed, 3 insertions, 2 deletions
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 */ |