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/Xi/extinit.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/Xi/extinit.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xi/extinit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/Xi/extinit.c b/nx-X11/programs/Xserver/Xi/extinit.c index 750fa46cb..81f5ca551 100644 --- a/nx-X11/programs/Xserver/Xi/extinit.c +++ b/nx-X11/programs/Xserver/Xi/extinit.c @@ -74,6 +74,7 @@ SOFTWARE. #include "extinit.h" #include "exglobals.h" #include "swaprep.h" +#include "protocol-versions.h" /* modules local to Xi */ #include "allowev.h" @@ -204,8 +205,9 @@ Mask PropagateMask[MAX_DEVICES]; static XExtensionVersion thisversion = {XI_Present, - XI_Add_XChangeDeviceControl_Major, - XI_Add_XChangeDeviceControl_Minor}; + SERVER_XI_MAJOR_VERSION, + SERVER_XI_MINOR_VERSION, + }; /********************************************************************** * |