[PULL] button mapping fix and unconstify patches

[Gaetan Nadon]

On 14-02-11 10:47 PM, Keith Packard wrote:
> Oh, right, I remember this from fontconfig -- ubuntu sets
> _FORTIFY_SOURCE by default. I'd love to use this in the X server by
> default, but I'm concerned that we'll end up breaking builds on ubuntu
> if we unilaterally define it. Can you see what your build does with
>
>         $ make CC="gcc -D_FORTIFY_SOURCE=2"
First, I need to correct a mistake: the O/S is the unreleased 14-04
version. The 13-10 version contains gcc 4.8.1 and I wanted 4.8.2 for the
test.

I need a clean build of the xserver module.

On gcc 4.8.2, (Ubuntu 14-04) I get a complete clean build.
On gcc 4.6.3 (Ubuntu 12-04), I get the following error in hw/vfb when
linking

    ../../Xext/.libs/libXext.a(xvmc.o): In function
    `xf86XvMCRegisterDRInfo':
    /home/nadon/xorg/src/xserver/Xext/xvmc.c:808: undefined reference to
    `strlcpy'
    /home/nadon/xorg/src/xserver/Xext/xvmc.c:809: undefined reference to
    `strlcpy'
    ../../os/os.O: In function `siHostnameAddrMatch':
    /home/nadon/xorg/src/xserver/os/access.c:1683: undefined reference
    to `strlcpy'
    ../../os/os.O: In function `AuthAudit':
    /home/nadon/xorg/src/xserver/os/connection.c:540: undefined
    reference to `strlcpy'
    /home/nadon/xorg/src/xserver/os/connection.c:559: undefined
    reference to `strlcpy'
    ../../os/os.O:/home/nadon/xorg/src/xserver/os/log.c:870: more
    undefined references to `strlcpy' follow

> if it works, then we'd be find setting it for all gcc builds, otherwise
> we'll need magic.
It could be optional if we add this feature to the
--enable-strict-compilation we have on every module.
> Here's a patch which cleans up all of the -Wunused-result warnings I'm
> getting with -D_FORTIFY_SOURCE=2. I haven't tried running this server...
The patch works as advertized. Too many code changes for me to give a rb.
I did manage to start X however.

Tested-by: Gaetan Nadon <memsize at videotron.ca>



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140212/da9fd1b8/attachment-0001.html>