aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/randr/rrxinerama.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-02 13:53:16 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-02 13:53:16 +0200
commit279d37127db241a9ee685f6b671f51aa21a972ea (patch)
treee41ad6d5cd85b97101c9fd3d37be951eee1a409e /nx-X11/programs/Xserver/randr/rrxinerama.c
parentdd5f5b56b48127641ca2bf70a272f60872f2568b (diff)
parent487870fff5cd1bc3db5ade4f5721f483f96119c7 (diff)
downloadnx-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/randr/rrxinerama.c')
-rw-r--r--nx-X11/programs/Xserver/randr/rrxinerama.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrxinerama.c b/nx-X11/programs/Xserver/randr/rrxinerama.c
index 9a164578f..5332ac01b 100644
--- a/nx-X11/programs/Xserver/randr/rrxinerama.c
+++ b/nx-X11/programs/Xserver/randr/rrxinerama.c
@@ -88,12 +88,7 @@
#include "randrstr.h"
#include "swaprep.h"
#include "panoramiXproto.h"
-#ifndef NXAGENT_SERVER
#include "protocol-versions.h"
-#else
-#define SERVER_RRXINERAMA_MAJOR_VERSION 1
-#define SERVER_RRXINERAMA_MINOR_VERSION 1
-#endif
/* Xinerama is not multi-screen capable; just report about screen 0 */
#define RR_XINERAMA_SCREEN 0