From 3b6c7c6b387c53a8100e36ce8d263bd6fc4555ea Mon Sep 17 00:00:00 2001
From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
Date: Tue, 25 Oct 2022 12:50:24 +0200
Subject: xts5: avoid multiple definitions of Dsp

Avoid errors like:

/usr/bin/ld: xts5/src/lib/libxtest.a.p/nextvinf.c.o:/xts5/src/lib/nextvinf.c:133: multiple definition of `Dsp'; xts5/src/lib/libxtest.a.p/ex_startup.c.o:/xts5/src/lib/ex_startup.c:135: first defined here
/usr/bin/ld: xts5/src/lib/libxtest.a.p/startup.c.o:/xts5/src/lib/startup.c:158: multiple definition of `Dsp'; xts5/src/lib/libxtest.a.p/ex_startup.c.o:/xts5/src/lib/ex_startup.c:135: first defined here

Part-of: <https://gitlab.freedesktop.org/xorg/test/xts/-/merge_requests/5>
---
 xts5/src/lib/nextvinf.c   | 2 +-
 xts5/src/lib/startup.c    | 2 +-
 xts5/src/xim/nextlclmod.c | 2 +-
 xts5/src/xim/nextlocale.c | 2 +-
 xts5/src/xim/nxtfontset.c | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xts5/src/lib/nextvinf.c b/xts5/src/lib/nextvinf.c
index 1c01afd1..84ca9cbe 100644
--- a/xts5/src/lib/nextvinf.c
+++ b/xts5/src/lib/nextvinf.c
@@ -130,7 +130,7 @@ purpose.  It is provided "as is" without express or implied warranty.
 #include	"tet_api.h"
 #include	"pixval.h"
 
-Display	*Dsp;
+extern	Display	*Dsp;
 
 static	int 	Visindex;
 static	int 	Nvis;
diff --git a/xts5/src/lib/startup.c b/xts5/src/lib/startup.c
index c7c98931..f8963149 100644
--- a/xts5/src/lib/startup.c
+++ b/xts5/src/lib/startup.c
@@ -155,7 +155,7 @@ int XInputFirstError;
 int XInputFirstEvent;
 int baddevice;
 
-Display	*Dsp;
+extern	Display	*Dsp;
 Window	Win;
 
 static	Window	ofocus;
diff --git a/xts5/src/xim/nextlclmod.c b/xts5/src/xim/nextlclmod.c
index fc3a5e60..f568f7c8 100644
--- a/xts5/src/xim/nextlclmod.c
+++ b/xts5/src/xim/nextlclmod.c
@@ -142,7 +142,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include	"pixval.h"
 #include 	"ximtest.h"
 
-Display	*Dsp;
+extern	Display	*Dsp;
 
 static	int 	CurLclMod = 0;
 static	int		NumLclMod = 0;
diff --git a/xts5/src/xim/nextlocale.c b/xts5/src/xim/nextlocale.c
index 52fe441b..146657ff 100644
--- a/xts5/src/xim/nextlocale.c
+++ b/xts5/src/xim/nextlocale.c
@@ -146,7 +146,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "pixval.h"
 #include "ximtest.h"
 
-Display	*Dsp;
+extern	Display	*Dsp;
 
 static	int 	CurLocale = 0;
 static	int	NumLocales = 0;
diff --git a/xts5/src/xim/nxtfontset.c b/xts5/src/xim/nxtfontset.c
index e89d3d0f..58faa6fa 100644
--- a/xts5/src/xim/nxtfontset.c
+++ b/xts5/src/xim/nxtfontset.c
@@ -142,7 +142,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include	"pixval.h"
 #include 	"ximtest.h"
 
-Display	*Dsp;
+extern	Display	*Dsp;
 
 static	int 	CurFontSet = 0;
 static	int		NumFontSet = 0;
-- 
cgit v1.2.3