Skip to content

N
nx-libs
Unverified Commit 47ef330c authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

Merge branch 'uli42-pr/reenable_xc-misc' into 3.6.x

Attributes GH PR #628: https://github.com/ArcticaProject/nx-libs/pull/628 Fixes: ArcticaProject/nx-libs#589
parents 5f9f744c 43456713
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
nx-X11/config/cf/X11.tmpl
View file @ 47ef330c
...@@ -623,6 +623,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN ...@@ -623,6 +623,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
DBEDefines \ DBEDefines \
XTestDefines \ XTestDefines \
XSyncDefines \ XSyncDefines \
XCMiscDefines \
RECORDDefines \ RECORDDefines \
ShmDefines \ ShmDefines \
BigReqDefines \ BigReqDefines \
......
nx-X11/programs/Xserver/Xext/xcmisc.c
View file @ 47ef330c
...@@ -30,8 +30,8 @@ from The Open Group. ...@@ -30,8 +30,8 @@ from The Open Group.
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#include <X11/X.h> #include <nx-X11/X.h>
#include <X11/Xproto.h> #include <nx-X11/Xproto.h>
#include "misc.h" #include "misc.h"
#include "os.h" #include "os.h"
#include "dixstruct.h" #include "dixstruct.h"
......
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