diff options
| author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-05-22 13:53:31 +0000 |
|---|---|---|
| committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-05-22 13:53:31 +0000 |
| commit | 96b21753bc12c601359f2c0e9acaeb81ad671bdc (patch) | |
| tree | 3aac8e116264c25820d4f330a43ebc482b2bd64e | |
| parent | 4dad30d0386c07486e2e17908af5bbd290b54906 (diff) | |
| download | rockbox-96b21753bc12c601359f2c0e9acaeb81ad671bdc.zip rockbox-96b21753bc12c601359f2c0e9acaeb81ad671bdc.tar.gz rockbox-96b21753bc12c601359f2c0e9acaeb81ad671bdc.tar.bz2 rockbox-96b21753bc12c601359f2c0e9acaeb81ad671bdc.tar.xz | |
Fix some residual 'defined but not used' warnings by GCC 4.6.0 for touchscreen targets.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29910 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/gui/skin_engine/skin_touchsupport.c | 5 | ||||
| -rw-r--r-- | apps/plugins/brickmania.c | 3 | ||||
| -rw-r--r-- | apps/plugins/solitaire.c | 16 |
3 files changed, 16 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_touchsupport.c b/apps/gui/skin_engine/skin_touchsupport.c index beb6780..fb4780c 100644 --- a/apps/gui/skin_engine/skin_touchsupport.c +++ b/apps/gui/skin_engine/skin_touchsupport.c @@ -56,7 +56,6 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset, short x,y; short vx, vy; int type = action_get_touchscreen_press(&x, &y); - static int last_action = ACTION_NONE; struct touchregion *r, *temp = NULL; bool repeated = (type == BUTTON_REPEAT); bool released = (type == BUTTON_REL); @@ -109,7 +108,6 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset, if (r->armed && ((repeated && needs_repeat) || (released && !needs_repeat))) { - last_action = r->action; returncode = r->action; temp = r; } @@ -270,7 +268,6 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset, } return returncode; } - - last_action = ACTION_TOUCHSCREEN; + return ACTION_TOUCHSCREEN; } diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 379aadf..59059b8 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c @@ -2235,10 +2235,9 @@ static int brickmania_game_loop(void) if( move_button & BUTTON_TOUCHSCREEN) { int data; - short touch_x, touch_y; + short touch_x; rb->button_status_wdata(&data); touch_x = FIXED3(data >> 16); - touch_y = FIXED3(data & 0xffff); if(flip_sides) { diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index a873110..01a75df 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -629,6 +629,14 @@ CONFIG_KEYPAD == MROBE500_PAD #define NOT_A_COL -1 +#if defined(SOL_LEFT_PRE) || defined(SOL_RIGHT_PRE) || \ + defined(SOL_DOWN_PRE) || defined(SOL_UP_PRE) || \ + defined(SOL_CUR2STACK_PRE) || defined(SOL_MOVE_PRE) || \ + defined(SOL_REM2CUR_PRE) || defined(SOL_REM2STACK_PRE) || \ + defined(SOL_DRAW_PRE) +# define NEED_LASTBUTTON_VAR +#endif + typedef struct { signed char suit; @@ -1418,7 +1426,10 @@ int solitaire( int skipmenu ) { int i,j; - int button, lastbutton = 0; + int button; +#ifdef NEED_LASTBUTTON_VAR + int lastbutton = 0; +#endif int c,h,prevcard; int biggest_col_length; @@ -1906,8 +1917,9 @@ int solitaire( int skipmenu ) break; } - if( button != BUTTON_NONE ) +#ifdef NEED_LASTBUTTON_VAR lastbutton = button; +#endif /* fix incoherences concerning cur_col and cur_card */ c = find_card_col( cur_card ); |