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/hw/nxagent | |
| 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/hw/nxagent')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXshm.c | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Render.c | 23 |
2 files changed, 12 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index d2ff7fd8f..1ce72cbbe 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -47,7 +47,6 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: shm.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ #include <nx-X11/X.h> - #include "Trap.h" #include "Agent.h" diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index 866ab581c..8c822319d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -31,6 +31,7 @@ #include "mipict.h" #include "fbpict.h" #include "dixstruct.h" +#include "protocol-versions.h" #include "Agent.h" #include "Drawable.h" @@ -217,26 +218,26 @@ void nxagentRenderExtensionInit() + two versions. */ - if (major_version > RENDER_MAJOR || - (major_version == RENDER_MAJOR && - minor_version > RENDER_MINOR)) + if (major_version > SERVER_RENDER_MAJOR_VERSION || + (major_version == SERVER_RENDER_MAJOR_VERSION && + minor_version > SERVER_RENDER_MINOR_VERSION)) { #ifdef TEST fprintf(stderr, "nxagentRenderExtensionInit: Using render version [%d.%d] with " - "remote version [%d.%d].\n", RENDER_MAJOR, RENDER_MINOR, + "remote version [%d.%d].\n", SERVER_RENDER_MAJOR_VERSION, SERVER_RENDER_MINOR_VERSION, major_version, minor_version); #endif - nxagentRenderVersionMajor = RENDER_MAJOR; - nxagentRenderVersionMinor = RENDER_MINOR; + nxagentRenderVersionMajor = SERVER_RENDER_MAJOR_VERSION; + nxagentRenderVersionMinor = SERVER_RENDER_MINOR_VERSION; } - else if (major_version < RENDER_MAJOR || - (major_version == RENDER_MAJOR && - minor_version < RENDER_MINOR)) + else if (major_version < SERVER_RENDER_MAJOR_VERSION || + (major_version == SERVER_RENDER_MAJOR_VERSION && + minor_version < SERVER_RENDER_MINOR_VERSION)) { #ifdef TEST fprintf(stderr, "Info: Local render version %d.%d is higher " - "than remote version %d.%d.\n", RENDER_MAJOR, RENDER_MINOR, + "than remote version %d.%d.\n", SERVER_RENDER_MAJOR_VERSION, SERVER_RENDER_MINOR_VERSION, major_version, minor_version); fprintf(stderr, "Info: Lowering the render version reported to clients.\n"); @@ -249,7 +250,7 @@ void nxagentRenderExtensionInit() { #ifdef TEST fprintf(stderr, "nxagentRenderExtensionInit: Local render version %d.%d " - "matches remote version %d.%d.\n", RENDER_MAJOR, RENDER_MINOR, + "matches remote version %d.%d.\n", SERVER_RENDER_MAJOR_VERSION, SERVER_RENDER_MINOR_VERSION, major_version, minor_version); #endif |