[PULL] button mapping fix and unconstify patches

[Gaetan Nadon]

On 14-02-10 06:36 PM, Alan Coopersmith wrote:
> I believe the ones about shadowing system functions like index are
> silenced
> in newer gcc versions - for instance I see them with gcc 4.5 but not 4.7.
> Which gcc did you use in this build?
gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3. From Ubuntu 12.04 LTS.