Skip to content

N
nx-libs
Unverified Commit 049bf681 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'uli42-pr/improve_include_path_handling' into 3.6.x

Attributes GH PR #201: https://github.com/ArcticaProject/nx-libs/pull/201
parents a906bf0f 97a5cec7
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 11 deletions
nx-X11/include/Imakefile
View file @ 049bf681
XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $
XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $ XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $
NULL = NULL =
...@@ -56,6 +52,10 @@ all:: ...@@ -56,6 +52,10 @@ all::
BuildIncludes($(HEADERS),nx-X11,..) BuildIncludes($(HEADERS),nx-X11,..)
includes::
-$(RM) $(BUILDINCDIR)/X11
-$(LN) nx-X11 $(BUILDINCDIR)/X11
#if BuildLibraries #if BuildLibraries
InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS)) InstallMultipleFlags($(HEADERS),$(INCDIR)/nx-X11,$(INSTINCFLAGS))
#endif #endif
......
nx-X11/programs/Xserver/hw/nxagent/Agent.h
View file @ 049bf681
...@@ -112,13 +112,6 @@ typedef XID KeySym64; ...@@ -112,13 +112,6 @@ typedef XID KeySym64;
#define NX_TRANS_SOCKET #define NX_TRANS_SOCKET
#define GC XlibGC #define GC XlibGC
#include <nx-X11/Xlib.h> #include <nx-X11/Xlib.h>
/*
<X11/extension/shape.h> includes <X11/Xutil.h> but we need
<nx-X11/Xutil.h>. As both use the same header guard we can first
include <nx-X11/Xutil.h> and be ok.
*/
#include <nx-X11/Xutil.h>
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
#undef GC #undef GC
......
Markdown is supported
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