libX11: Changes to 'master'

[GitLab Mirror]

 src/globals.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 487e9489d1e086cc62c53045206ab6d6d9d02031
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Wed Jun 22 16:15:37 2022 +0100

    Fix Win32 build with -fno-common
    
    /work/xorg/lib/libX11/src/XlibInt.c:1968: multiple definition of `_Xdebug_p'; .libs/globals.o:globals.c:(.bss+0xc): first defined here
    
    Avoid redundant definition of _Xdebug_p in globals.c (which is under the
    influence of _Xdebug being #defined to _Xdebug_p.
    
    This appears to be an ancient hack to work around data exports resolving
    to the address of the import stub, not the import. (See [1]).
    
    (This is probably no longer needed or can be done in a better way, as
    per the discussion under --enable-auto-import in the ld manpage.)
    
    [1] https://cygwin.com/pipermail/cygwin-xfree/2001-May/004606.html
    
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>