[PULL] button mapping fix and unconstify patches

[Gaetan Nadon]

On 14-02-09 02:42 PM, Alan Coopersmith wrote:
> On 02/ 9/14 11:12 AM, Keith Packard wrote:
>> Gaetan Nadon <memsize at videotron.ca> writes:
>>
>>> Ok, so the recent patch wave did not also address all commented out
>>> warning flags. Just asking in case some of them needed to be
>>> re-instated.
>>
>> With Alan's -Wlogical-op change, I still have only a single warning
>> (bswap_CARD64 in indirect_dispatch_swap.c).
>
> Hmm, I don't see that, probably because the bswap_64 macro it uses is
> platform specific.
>
32 bit computer perhaps.

I found only these, on a full jhbuild in libxkbfile:

xkbmisc.c:100:13: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
xkbmisc.c:114:13: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]