From 762bfb50425428dddf5dd7df87836c52d21eb064 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 30 Jan 2020 22:45:18 +0100 Subject: nxagent: Fix double variables nxagentCorrupted* were defined twice! Fixes ArcticaProject/nx-libs#907 (1/3) --- nx-X11/programs/Xserver/hw/nxagent/Drawable.c | 5 +++++ nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 3 --- nx-X11/programs/Xserver/hw/nxagent/Window.c | 6 ------ 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index ba6d48fa5..bdbf4fcf8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -91,6 +91,11 @@ RESTYPE RT_NX_CORR_WINDOW; RESTYPE RT_NX_CORR_PIXMAP; int nxagentCorruptedPixmaps = 0; + +/* + * Number of windows which need synchronization. + */ + int nxagentCorruptedWindows = 0; int nxagentCorruptedBackgrounds = 0; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index c1ca9bc2f..13ac47d00 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -71,9 +71,6 @@ RESTYPE RT_NX_PIXMAP; int nxagentPixmapPrivateIndex; -int nxagentCorruptedPixmaps; -int nxagentCorruptedBackgrounds; - /* * Force deallocation of the virtual pixmap. */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index a898f8592..4885a1957 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -75,12 +75,6 @@ int nxagentWindowPrivateIndex; -/* - * Number of windows which need synchronization. - */ - -int nxagentCorruptedWindows; - /* * Used to track nxagent window's visibility. */ -- cgit v1.2.3