aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-12-04 21:14:24 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-12-04 21:14:24 +0100
commitb38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9 (patch)
treeee0d60bb4a9c500f6072891a7802fd06be15ce8a /nx-X11/config
parent62f8e50e7a5ddc6952a951edc37ee53c2a828675 (diff)
parent508d2deae98846111299a3693033a507010e3c91 (diff)
downloadnx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.tar.gz
nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.tar.bz2
nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.zip
Merge branch 'sunweaver-pr/extmod-xfree86loader-cleanup' into 3.6.x
Attributes GH PR #251: https://github.com/ArcticaProject/nx-libs/pull/251
Diffstat (limited to 'nx-X11/config')
-rw-r--r--nx-X11/config/cf/xorg.cf4
1 files changed, 1 insertions, 3 deletions
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 470c9adb8..fb0dbfd08 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -556,8 +556,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
# define ExtraLoaderDefines /**/
#endif
-# define XFree86LoaderDefines /**/
-
#ifndef HasBsdMake
#define HasBsdMake NO
#endif
@@ -584,7 +582,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#ifndef XFree86ServerDefines
# define XFree86ServerDefines -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \
XFree86XvDefines \
- XFree86LoaderDefines -DXFree86Server \
+ -DXFree86Server \
XFree86XvMCDefines \
SmartScheduleDefines \
DebugDefines XFree86XResDefines \