From 96b21753bc12c601359f2c0e9acaeb81ad671bdc Mon Sep 17 00:00:00 2001 From: Andree Buschmann Date: Sun, 22 May 2011 13:53:31 +0000 Subject: 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 --- apps/plugins/brickmania.c | 3 +-- apps/plugins/solitaire.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'apps/plugins') diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 379aadfe65..59059b8cc7 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 a87311035f..01a75df39a 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 ); -- cgit v1.2.3