diff options
| author | Johannes Kauffmann <johanneskauffmann@hotmail.com> | 2022-10-25 12:50:24 +0200 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-04-14 17:39:15 +0000 |
| commit | 3b6c7c6b387c53a8100e36ce8d263bd6fc4555ea (patch) | |
| tree | 57c0393f6e0516229626aa2e0b081aa3180b4a01 | |
| parent | 6be266b876557458766b640de2b366dcd5a28ec2 (diff) | |
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>
| -rw-r--r-- | xts5/src/lib/nextvinf.c | 2 | ||||
| -rw-r--r-- | xts5/src/lib/startup.c | 2 | ||||
| -rw-r--r-- | xts5/src/xim/nextlclmod.c | 2 | ||||
| -rw-r--r-- | xts5/src/xim/nextlocale.c | 2 | ||||
| -rw-r--r-- | 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; |