diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-04-05 19:32:30 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-04-05 20:26:39 +0100 |
| commit | 268cda0f560ffdacf6186b923f5540ed5da52ef9 (patch) | |
| tree | 737ddff35d932ac2b70ce2bcf5b9505efd0c67e0 | |
| parent | d907ec9b0614e5c178720429dee7a8ef96df6aad (diff) | |
| download | netsurf-268cda0f560ffdacf6186b923f5540ed5da52ef9.tar.gz netsurf-268cda0f560ffdacf6186b923f5540ed5da52ef9.tar.bz2 | |
Fix cppcheck variableHidingTypedef
| -rw-r--r-- | amiga/gui.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index b893b6f2f..394927154 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -463,7 +463,7 @@ colour_option_from_pen(UWORD pen, struct Screen *screen, colour def_colour) { - ULONG colour[3]; + ULONG colr[3]; struct DrawInfo *drinfo; if((option < NSOPTION_SYS_COLOUR_START) || @@ -479,12 +479,12 @@ colour_option_from_pen(UWORD pen, if(pen == AMINS_SCROLLERPEN) pen = ami_system_colour_scrollbar_fgpen(drinfo); /* Get the colour of the pen being used for "pen" */ - GetRGB32(screen->ViewPort.ColorMap, drinfo->dri_Pens[pen], 1, (ULONG *)&colour); + GetRGB32(screen->ViewPort.ColorMap, drinfo->dri_Pens[pen], 1, (ULONG *)&colr); /* convert it to a color */ - def_colour = ((colour[0] & 0xff000000) >> 24) | - ((colour[1] & 0xff000000) >> 16) | - ((colour[2] & 0xff000000) >> 8); + def_colour = ((colr[0] & 0xff000000) >> 24) | + ((colr[1] & 0xff000000) >> 16) | + ((colr[2] & 0xff000000) >> 8); FreeScreenDrawInfo(screen, drinfo); } |