diff options
author | Nils Wallménius <nils@rockbox.org> | 2008-10-25 17:03:38 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2008-10-25 17:03:38 +0000 |
commit | e477052497a7cca66f0068fff97f2e3015aaffc7 (patch) | |
tree | ce1665c98f614956f9a5348e8b6a32192634f4ac /apps | |
parent | 2f1ec7d9a5f35456216eac6b6dd511f948492846 (diff) | |
download | rockbox-e477052497a7cca66f0068fff97f2e3015aaffc7.tar.gz rockbox-e477052497a7cca66f0068fff97f2e3015aaffc7.zip |
Add MEM_FUNCTION_WRAPPERS to fix linker errors and tweak the ipod buttonmap slightly
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18877 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/calendar.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index b54cd98199..577891e456 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -72,13 +72,13 @@ PLUGIN_HEADER | |||
72 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 72 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
73 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 73 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
74 | #define CALENDAR_QUIT (BUTTON_SELECT|BUTTON_MENU) | 74 | #define CALENDAR_QUIT (BUTTON_SELECT|BUTTON_MENU) |
75 | #define CALENDAR_SELECT (BUTTON_SELECT|BUTTON_PLAY) | 75 | #define CALENDAR_SELECT (BUTTON_SELECT|BUTTON_REL) |
76 | #define CALENDAR_NEXT_WEEK BUTTON_SCROLL_FWD | 76 | #define CALENDAR_NEXT_WEEK BUTTON_SCROLL_FWD |
77 | #define CALENDAR_PREV_WEEK BUTTON_SCROLL_BACK | 77 | #define CALENDAR_PREV_WEEK BUTTON_SCROLL_BACK |
78 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT | 78 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT |
79 | #define CALENDAR_PREV_DAY BUTTON_LEFT | 79 | #define CALENDAR_PREV_DAY BUTTON_LEFT |
80 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY | 80 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY |
81 | #define CALENDAR_PREV_MONTH BUTTON_MENU | 81 | #define CALENDAR_PREV_MONTH (BUTTON_MENU|BUTTON_REL) |
82 | 82 | ||
83 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) | 83 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
84 | #define CALENDAR_QUIT BUTTON_POWER | 84 | #define CALENDAR_QUIT BUTTON_POWER |
@@ -185,6 +185,8 @@ PLUGIN_HEADER | |||
185 | 185 | ||
186 | static const struct plugin_api* rb; | 186 | static const struct plugin_api* rb; |
187 | 187 | ||
188 | MEM_FUNCTION_WRAPPERS(rb) | ||
189 | |||
188 | static bool leap_year; | 190 | static bool leap_year; |
189 | /* days_in_month[][0] is for December */ | 191 | /* days_in_month[][0] is for December */ |
190 | static const int days_in_month[2][13] = { | 192 | static const int days_in_month[2][13] = { |