aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-01-30 22:46:40 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-07 14:57:21 +0200
commitfdde5b125fb514a3d1db5203bf468ab8e14157a4 (patch)
tree6c0666c9d43898250671dfadb9d98f14c0894ba3 /nx-X11
parent762bfb50425428dddf5dd7df87836c52d21eb064 (diff)
downloadnx-libs-fdde5b125fb514a3d1db5203bf468ab8e14157a4.tar.gz
nx-libs-fdde5b125fb514a3d1db5203bf468ab8e14157a4.tar.bz2
nx-libs-fdde5b125fb514a3d1db5203bf468ab8e14157a4.zip
nxagent: move variable definitions from headers to source files
Fixes ArcticaProject/nx-libs#907 (2/3)
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Cursor.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Cursor.h2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Visual.h2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c3
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Windows.h3
5 files changed, 7 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
index bafb30cea..05c78e0ad 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c
@@ -77,6 +77,8 @@ is" without express or implied warranty.
#undef TEST
#undef DEBUG
+CursorBitsPtr nxagentAnimCursorBits;
+
/*
* Defined in Display.c. There are huge problems mixing the GC
* definition in Xlib with the server code. This must be reworked.
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h b/nx-X11/programs/Xserver/hw/nxagent/Cursor.h
index e857834df..8237e5e15 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.h
@@ -65,7 +65,7 @@ typedef struct _AnimCur {
AnimCurElt *elts;
} AnimCurRec, *AnimCurPtr;
-CursorBitsPtr nxagentAnimCursorBits;
+extern CursorBitsPtr nxagentAnimCursorBits;
#define nxagentIsAnimCursor(c) ((c)->bits == nxagentAnimCursorBits)
#define nxagentGetAnimCursor(c) ((AnimCurPtr) ((c) + 1))
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Visual.h b/nx-X11/programs/Xserver/hw/nxagent/Visual.h
index 40946f3c0..3f173021b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Visual.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Visual.h
@@ -74,7 +74,7 @@ Colormap nxagentDefaultVisualColormap(Visual *visual);
(v1).blue_mask == (v2).red_mask) && \
(v1).colormap_size == (v2).colormap_size)
-Visual nxagentAlphaVisual;
+extern Visual nxagentAlphaVisual;
void nxagentInitAlphaVisual();
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index 4885a1957..e6b9c03df 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -83,6 +83,9 @@ int nxagentVisibility = VisibilityUnobscured;
unsigned long nxagentVisibilityTimeout = 0;
Bool nxagentVisibilityStop = False;
+ConfiguredWindowStruct *nxagentConfiguredWindowList;
+StaticResizedWindowStruct *nxagentStaticResizedWindowList;
+
/*
* Set here the required log level.
*/
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Windows.h b/nx-X11/programs/Xserver/hw/nxagent/Windows.h
index a5f20343b..8666ebec9 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Windows.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Windows.h
@@ -288,7 +288,6 @@ typedef struct _ConfiguredWindow
unsigned int valuemask;
} ConfiguredWindowStruct;
-ConfiguredWindowStruct *nxagentConfiguredWindowList;
typedef struct _StaticResizedWindow
{
@@ -300,8 +299,6 @@ typedef struct _StaticResizedWindow
int offY;
} StaticResizedWindowStruct;
-StaticResizedWindowStruct *nxagentStaticResizedWindowList;
-
void nxagentPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind);
void nxagentFlushConfigureWindow(void);