]> git.sur5r.net Git - openocd/commit
jlink: deconflict local variables from global symbols
authorPeter A. Bigot <pab@pabigot.com>
Mon, 4 Jan 2016 20:37:43 +0000 (14:37 -0600)
committerSpencer Oliver <spen@spen-soft.co.uk>
Wed, 6 Jan 2016 20:01:28 +0000 (20:01 +0000)
commit554313b68b4791924a145c3db8082932afb91fbc
treeaf1e1e52a903dc013f4b3a5d582194520af8d67c
parent48768db9d6420013ccd88107a67de85fdcd5bbd8
jlink: deconflict local variables from global symbols

BeagleBone debian 7 builds produce:
    jlink.c: In function 'jlink_speed':
    jlink.c:218:11: error: declaration of 'div' shadows a global declaration [-Werror=shadow]
    jlink.c: In function 'check_trace_freq':
    jlink.c:1065:54: error: declaration of 'div' shadows a global declaration [-Werror=shadow]
    jlink.c: In function 'config_trace':
    jlink.c:1101:11: error: declaration of 'div' shadows a global declaration [-Werror=shadow]

Fix this by changing the local variable to 'divider'.

Change-Id: I96a0cc0f7d4d4af5a56aa1e918e5416d3c61cbfe
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Reviewed-on: http://openocd.zylin.com/3185
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
src/jtag/drivers/jlink.c