diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-28 12:07:10 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 13:51:37 +0200 |
| commit | 487870fff5cd1bc3db5ade4f5721f483f96119c7 (patch) | |
| tree | e41ad6d5cd85b97101c9fd3d37be951eee1a409e /nx-X11/programs/Xserver/xkb | |
| parent | a08e2323e838099cc2079287c5b3fd1e9b7f20f7 (diff) | |
| download | nx-libs-487870fff5cd1bc3db5ade4f5721f483f96119c7.tar.gz nx-libs-487870fff5cd1bc3db5ade4f5721f483f96119c7.tar.bz2 nx-libs-487870fff5cd1bc3db5ade4f5721f483f96119c7.zip | |
Xserver/include/protocol-versions.h: Switch to having an Xserver-specific header file containing all use protocol versions.
Diffstat (limited to 'nx-X11/programs/Xserver/xkb')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkb.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 4a1561db3..20aab8ef0 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -41,6 +41,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <nx-X11/extensions/XKBsrv.h> #include "extnsionst.h" #include "xkb.h" +#include "protocol-versions.h" #include <nx-X11/extensions/XI.h> @@ -168,9 +169,9 @@ ProcXkbUseExtension(ClientPtr client) int supported; REQUEST_SIZE_MATCH(xkbUseExtensionReq); - if (stuff->wantedMajor != XkbMajorVersion) { + if (stuff->wantedMajor != SERVER_XKB_MAJOR_VERSION) { /* pre-release version 0.65 is compatible with 1.00 */ - supported= ((XkbMajorVersion==1)&& + supported= ((SERVER_XKB_MAJOR_VERSION==1)&& (stuff->wantedMajor==0)&&(stuff->wantedMinor==65)); } else supported = 1; @@ -190,15 +191,15 @@ ProcXkbUseExtension(ClientPtr client) client->index, (long)client->clientAsMask, stuff->wantedMajor,stuff->wantedMinor, - XkbMajorVersion,XkbMinorVersion); + SERVER_XKB_MAJOR_VERSION,SERVER_XKB_MINOR_VERSION); } memset(&rep, 0, sizeof(xkbUseExtensionReply)); rep.type = X_Reply; rep.supported = supported; rep.length = 0; rep.sequenceNumber = client->sequence; - rep.serverMajor = XkbMajorVersion; - rep.serverMinor = XkbMinorVersion; + rep.serverMajor = SERVER_XKB_MAJOR_VERSION; + rep.serverMinor = SERVER_XKB_MINOR_VERSION; if ( client->swapped ) { swaps(&rep.sequenceNumber, n); swaps(&rep.serverMajor, n); |