aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-01-30 22:45:18 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-07 14:57:21 +0200
commit762bfb50425428dddf5dd7df87836c52d21eb064 (patch)
tree0fcd7809484b4582ef406e9cdd083e102f202be9
parentd1e91fae60721687943f622b910221da47df28d2 (diff)
downloadnx-libs-762bfb50425428dddf5dd7df87836c52d21eb064.tar.gz
nx-libs-762bfb50425428dddf5dd7df87836c52d21eb064.tar.bz2
nx-libs-762bfb50425428dddf5dd7df87836c52d21eb064.zip
nxagent: Fix double variables
nxagentCorrupted* were defined twice! Fixes ArcticaProject/nx-libs#907 (1/3)
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Drawable.c5
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Pixmap.c3
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c6
3 files changed, 5 insertions, 9 deletions
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
@@ -76,12 +76,6 @@
int nxagentWindowPrivateIndex;
/*
- * Number of windows which need synchronization.
- */
-
-int nxagentCorruptedWindows;
-
-/*
* Used to track nxagent window's visibility.
*/