diff options
author | Mihai Moldovan <ionic@ionic.de> | 2015-06-21 10:50:31 +0200 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2015-06-21 10:50:31 +0200 |
commit | fb2a4e4c510a80630722834f2cf408f8b731b4ef (patch) | |
tree | 3418ca9ac7561a45bae51c45dc272b61de0c5015 /nx-X11/programs/Xserver/mi/Imakefile | |
parent | cc92f77e9a3f20516de4276ecf8e178974ca1593 (diff) | |
parent | 26091f4bd6b975eaabafc042c7af50b22042e508 (diff) | |
download | nx-libs-fb2a4e4c510a80630722834f2cf408f8b731b4ef.tar.gz nx-libs-fb2a4e4c510a80630722834f2cf408f8b731b4ef.tar.bz2 nx-libs-fb2a4e4c510a80630722834f2cf408f8b731b4ef.zip |
Merge branch 'sunweaver-pr/hw-driver-cleanup' into arctica-3.6.x
Attributes GH PR #41: https://github.com/ArcticaProject/nx-libs/pull/41
Diffstat (limited to 'nx-X11/programs/Xserver/mi/Imakefile')
-rw-r--r-- | nx-X11/programs/Xserver/mi/Imakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile index 24caa0299..e62fb0005 100644 --- a/nx-X11/programs/Xserver/mi/Imakefile +++ b/nx-X11/programs/Xserver/mi/Imakefile @@ -62,7 +62,7 @@ OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \ mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \ micmap.o mioverlay.o -#if (defined (XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) /* * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o * used by Xnest, Xvfb |