From a5f71f084e9f32e947a04da69edb7aae96d61697 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 14 Apr 2015 09:42:35 +0200 Subject: NXAGENT_UPGRADE code cleanup: NX agent contains/ed two build trees. An old one (probably pre-3.x.y) and a "newer" one. The "newer" code tree used to become enabled by setting NXUpgradeAgentServer in nx-X11/config/cf/host.def to YES. As building the NXUpgradeAgentServer has been the default for years now, we drop all code that does not get used at build time for NXUpgradeAgentServer == YES (i.e., the code that belongs to the pre-3.x.y phase of NX agent). --- nx-X11/programs/Xserver/hw/nxagent/Composite.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Composite.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Composite.c b/nx-X11/programs/Xserver/hw/nxagent/Composite.c index c79104fc1..ae3cbb5a4 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Composite.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Composite.c @@ -24,18 +24,8 @@ #include "Options.h" #include "Windows.h" -#undef NXAGENT_UPGRADE - -#ifndef NXAGENT_UPGRADE - #include "NXcomposite.h" -#else - -#include "composite.h" - -#endif - /* * Set here the required log level. */ -- cgit v1.2.3