diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-03-03 16:21:33 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-03 16:21:33 +0100 |
commit | 89ccf26d65a3f205e54d9f6240b672f970e7b9c1 (patch) | |
tree | 4a18ef7a3e031fa48acc292c8f52a0eaf3d49418 /nx-X11/programs/Xserver/mi/miscrinit.c | |
parent | a54f3e0a8945b7e10d4bbeab5f4b14a35fbd3332 (diff) | |
parent | 1c7b45d57380f6d445c8867fd77a1ecab072ee45 (diff) | |
download | nx-libs-89ccf26d65a3f205e54d9f6240b672f970e7b9c1.tar.gz nx-libs-89ccf26d65a3f205e54d9f6240b672f970e7b9c1.tar.bz2 nx-libs-89ccf26d65a3f205e54d9f6240b672f970e7b9c1.zip |
Merge branch 'sunweaver-pr/really-enable-MITSHM-in-fboverlay-c' into 3.6.x
Attributes GH PR #318: https://github.com/ArcticaProject/nx-libs/pull/318
Diffstat (limited to 'nx-X11/programs/Xserver/mi/miscrinit.c')
-rw-r--r-- | nx-X11/programs/Xserver/mi/miscrinit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c index ceb51ab4c..ac782cf7d 100644 --- a/nx-X11/programs/Xserver/mi/miscrinit.c +++ b/nx-X11/programs/Xserver/mi/miscrinit.c @@ -39,8 +39,7 @@ from The Open Group. #include "dix.h" #include "miline.h" #ifdef MITSHM -#define _XSHM_SERVER_ -#include <X11/extensions/XShm.h> +#include "shmint.h" #endif /* We use this structure to propogate some information from miScreenInit to |