[PULL] button mapping fix and unconstify patches

[Peter Hutterer]

On Wed, Feb 12, 2014 at 05:43:04PM -0500, Gaetan Nadon wrote:
> On 14-02-12 12:57 PM, Keith Packard wrote:
> > This function is supposed to be automatically replaced with os/strlcpy.c
> > when not present in your C library.
> >
> > Something appears to be amiss here; I don't have strlcpy *or* strlcat in
> > my glibc, and so configure correctly adds os/strlcpy.c and os/strlcat.c
> > to the build.
> >
> I cannot reproduce the problem anymore. I retraced my commands from the
> terminal, run make CC="gcc -D_FORTIFY_SOURCE=2" again, this time it works.

just an issue with incomplete builds, happens to me when I rebase or switch
branches. make clean in os/ usually does the job, otherwise
autoreconf/configure definitely does.

Cheers,
   Peter

> This shows it is already defined:
> 
>     nadon at memsize:~/xorg/src/app/xclock$ gcc -dM -E - < /dev/null | grep
>     FORTIFY
>     #define _FORTIFY_SOURCE 2
> 
> There does not seem to be any harm in defining for all builds. If it is
> not supported, it will be ignored.
> 
> Let me know, and I can create a patch to add this in util-macros. It can
> be conditionally added using AC_CHECK_DECLS. If it is already define, it
> won't be added.
>