search

ArcticaProject / nx-libs

nx-libs
Other
120 stars 39 forks source link

drop temporary include files #297

Open uli42 opened 7 years ago

uli42 commented 7 years ago

nx-X11/programs/Xserver/hw/nxagent/X11/include/Xrandr_nxagent.h contains this section:

/*
 * This file is a reduced version of the header file of
 * <X11/extensions/Xrandr.h>
 *
 * This copy of code has been introduced to allow a clear namespace
 * separation between <X11/...> and <nx-X11/...> header files.
 *
 * This version of the Xrandr library header file only contains symbols
 * required by nxagent and strictly avoids indirectly including
 * from an X11 library that is also shipped in nx-X11/lib/.
 *
 * When using <X11/extensions/Xrandr.h> instead for inclusion in
 * nxagent, it will attempt pulling in the <X11/extensions/Xrender.h>
 * header which in turn will include <X11/Xlib.h>. However, the headers of
 * the same name from <nx-X11/...> should be used instead.
 *
 * FIXME: Once the nxagent Xserver starts using libXrender from X.Org, this
 * hack can be removed.
 *
 * 2015/06/26, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 */

I think this goal has been reached, hasn't it? So some (if not all) of these headers can be dropped.

As we are also having a X11 compatibility link now this should be droppable anyway.

sunweaver commented 7 years ago

I can revisit those header files. But afair they were needed because of differences in the nx-libs X11 core proto headers used by the Xserver and the X.org X11 core proto headers shipped in libX* from X.org. I don't think that we can drop those temporary header files at the moment.

The moment those files can really be dropped is when we start using X.org X11 core proto headers instead of shipping our own in nx-libs.

uli42 commented 7 years ago

So then the problem really is that we want to be able to compile on OSes shipping older Xorg headers.

sunweaver commented 7 years ago

On Sa 10 Dez 2016 21:58:42 CET, Ulrich Sibiller wrote:

So then the problem really is that we want to be able to compile on OSes shipping older Xorg headers.

Yes. Or rather, the problem is that the main sponsor of the nx-libs
work has this as a requirement (SLES 11).

Mike --

DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby mobile: +49 (1520) 1976 148 landline: +49 (4354) 8390 139

GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22 0782 9AF4 6B30 2577 1B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de