diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 13:53:16 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 13:53:16 +0200 |
commit | 279d37127db241a9ee685f6b671f51aa21a972ea (patch) | |
tree | e41ad6d5cd85b97101c9fd3d37be951eee1a409e /nx-X11/programs/Xserver/composite/compext.c | |
parent | dd5f5b56b48127641ca2bf70a272f60872f2568b (diff) | |
parent | 487870fff5cd1bc3db5ade4f5721f483f96119c7 (diff) | |
download | nx-libs-279d37127db241a9ee685f6b671f51aa21a972ea.tar.gz nx-libs-279d37127db241a9ee685f6b671f51aa21a972ea.tar.bz2 nx-libs-279d37127db241a9ee685f6b671f51aa21a972ea.zip |
Merge branch 'sunweaver-pr/protocols-version-h' into 3.6.x
Attributes GH PR #160: https://github.com/ArcticaProject/nx-libs/pull/160
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 12:42:42 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/composite/compext.c')
-rw-r--r-- | nx-X11/programs/Xserver/composite/compext.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/composite/compext.c b/nx-X11/programs/Xserver/composite/compext.c index d5f8fd6d4..dbde88625 100644 --- a/nx-X11/programs/Xserver/composite/compext.c +++ b/nx-X11/programs/Xserver/composite/compext.c @@ -29,16 +29,9 @@ #include "compint.h" #include "XI.h" #include "XIproto.h" +#include "protocol-versions.h" #include "extinit.h" -#ifndef SERVER_COMPOSITE_MAJOR_VERSION -#define SERVER_COMPOSITE_MAJOR_VERSION 0 -#endif - -#ifndef SERVER_COMPOSITE_MINOR_VERSION -#define SERVER_COMPOSITE_MINOR_VERSION 4 -#endif - static CARD8 CompositeReqCode; #ifndef NXAGENT_SERVER |