diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-05-15 22:25:06 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-05-15 22:25:06 +0000 |
commit | 06adb38326fc542e05799941ae59a13ba5c8ee86 (patch) | |
tree | 90b63fc6040bbcef1de19d85f530f4330a3a28b7 | |
parent | 3763ace3ec459b5dc7de796bd09d3f90b5dd69ba (diff) | |
download | rockbox-06adb38326fc542e05799941ae59a13ba5c8ee86.tar.gz rockbox-06adb38326fc542e05799941ae59a13ba5c8ee86.zip |
Fix last reds, database tool definitely needs rework.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26072 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/hosted/sdl/button-sdl.h | 2 | ||||
-rw-r--r-- | tools/database/database.c | 4 | ||||
-rw-r--r-- | tools/database/database.make | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/firmware/target/hosted/sdl/button-sdl.h b/firmware/target/hosted/sdl/button-sdl.h index 75a68c49bc..e61920cc04 100644 --- a/firmware/target/hosted/sdl/button-sdl.h +++ b/firmware/target/hosted/sdl/button-sdl.h | |||
@@ -27,6 +27,8 @@ | |||
27 | #include "config.h" | 27 | #include "config.h" |
28 | 28 | ||
29 | bool button_hold(void); | 29 | bool button_hold(void); |
30 | #undef button_init_device | ||
30 | void button_init_device(void); | 31 | void button_init_device(void); |
32 | int button_read_device(void); | ||
31 | 33 | ||
32 | #endif /* __BUTTON_SDL_H__ */ | 34 | #endif /* __BUTTON_SDL_H__ */ |
diff --git a/tools/database/database.c b/tools/database/database.c index 41e73ae4a3..0f9304eb0a 100644 --- a/tools/database/database.c +++ b/tools/database/database.c | |||
@@ -40,12 +40,12 @@ void mutex_unlock(struct mutex *m) | |||
40 | (void)m; | 40 | (void)m; |
41 | } | 41 | } |
42 | 42 | ||
43 | void thread_sdl_thread_lock(void *me) | 43 | void sim_thread_lock(void *me) |
44 | { | 44 | { |
45 | (void)me; | 45 | (void)me; |
46 | } | 46 | } |
47 | 47 | ||
48 | void * thread_sdl_thread_unlock(void) | 48 | void * sim_thread_unlock(void) |
49 | { | 49 | { |
50 | return (void*)1; | 50 | return (void*)1; |
51 | } | 51 | } |
diff --git a/tools/database/database.make b/tools/database/database.make index 54913d8d4a..d5e10099ef 100644 --- a/tools/database/database.make +++ b/tools/database/database.make | |||
@@ -32,8 +32,8 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \ | |||
32 | -I$(APPSDIR) \ | 32 | -I$(APPSDIR) \ |
33 | -I$(BUILDDIR) \ | 33 | -I$(BUILDDIR) \ |
34 | 34 | ||
35 | SIMINCLUDES += -I$(ROOTDIR)/uisimulator/sdl -I$(ROOTDIR)/uisimulator/common \ | 35 | SIMINCLUDES += -I$(FIRMDIR)/target/hosted/sdl -I$(FIRMDIR)/target/hosted \ |
36 | -I$(FIRMDIR)/export $(TARGET_INC) -I$(BUILDDIR) -I$(APPSDIR) | 36 | -I$(ROOTDIR)/uisimulator/common -I$(FIRMDIR)/export -I$(BUILDDIR) -I$(APPSDIR) |
37 | 37 | ||
38 | # Makes mkdepfile happy | 38 | # Makes mkdepfile happy |
39 | GCCOPTS+=`$(SDLCONFIG) --cflags` | 39 | GCCOPTS+=`$(SDLCONFIG) --cflags` |