diff options
| author | Johannes Kauffmann <johanneskauffmann@hotmail.com> | 2022-10-25 13:10:51 +0200 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-04-14 17:39:15 +0000 |
| commit | f0bae09e55ac907b7ee96c3b0a75b4d9f1ae5829 (patch) | |
| tree | bbf4b08423ff1a38253a156d6fca9c9a88b0dd62 | |
| parent | 3b6c7c6b387c53a8100e36ce8d263bd6fc4555ea (diff) | |
Avoid errors like:
/usr/bin/ld: xts5/src/lib/libxtest.a.p/startup.c.o:/xts5/src/lib/startup.c:168: multiple definition of `ErrdefGC'; xts5/src/lib/libxtest.a.p/ex_startup.c.o:/xts5/src/lib/ex_startup.c:140: first defined here
/usr/bin/ld: xts5/src/lib/libxtest.a.p/startup.c.o:/xts5/src/lib/startup.c:169: multiple definition of `ErrdefColormap'; xts5/src/lib/libxtest.a.p/ex_startup.c.o:/xts5/src/lib/ex_startup.c:141: first defined here
Part-of: <https://gitlab.freedesktop.org/xorg/test/xts/-/merge_requests/5>
| -rw-r--r-- | xts5/src/lib/startup.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xts5/src/lib/startup.c b/xts5/src/lib/startup.c index f8963149..a8499165 100644 --- a/xts5/src/lib/startup.c +++ b/xts5/src/lib/startup.c @@ -156,23 +156,23 @@ int XInputFirstEvent; int baddevice; extern Display *Dsp; -Window Win; +extern Window Win; static Window ofocus; static int revert_to; static char **odir_array; static int odirs; -Window ErrdefWindow; -Drawable ErrdefDrawable; -GC ErrdefGC; -Colormap ErrdefColormap; +extern Window ErrdefWindow; +extern Drawable ErrdefDrawable; +extern GC ErrdefGC; +extern Colormap ErrdefColormap; /* NOT DONE YET */ -Pixmap ErrdefPixmap; -Atom ErrdefAtom; -Cursor ErrdefCursor; -Font ErrdefFont; +extern Pixmap ErrdefPixmap; +extern Atom ErrdefAtom; +extern Cursor ErrdefCursor; +extern Font ErrdefFont; void aborttest(); |