Verified Commit 001e6e2e authored by Jon Turney's avatar Jon Turney
Browse files

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's avatarJon Turney <jon.turney@dronecode.org.uk>
parent c601c779
Pipeline #619414 passed with stages
in 5 minutes and 22 seconds
......@@ -77,7 +77,9 @@ ZEROINIT (_XQEvent *, _qfree, NULL);
/*
* Debugging information and display list; used to be in XOpenDis.c
*/
#ifndef WIN32
ZEROINIT (int, _Xdebug, 0);
#endif
ZEROINIT (Display *, _XHeadOfDisplayList, NULL);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment