[xsrc/trunk]: xsrc/external/mit Avoid multiple definitions of the same variable.

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/eea8b8bf563b
branches:  trunk
changeset: 10733:eea8b8bf563b
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon May 31 21:44:19 2021 +0000

description:
Avoid multiple definitions of the same variable.

diffstat:

 external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h      |  2 +-
 external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h     |  2 +-
 external/mit/xf86-video-chips/dist/util/AsmMacros.h            |  2 +-
 external/mit/xf86-video-geode/dist/src/geode.h                 |  6 +++---
 external/mit/xf86-video-geode/dist/src/gx_video.c              |  2 +-
 external/mit/xf86-video-geode/dist/src/lx_driver.c             |  2 +-
 external/mit/xf86-video-geode/dist/src/panel.c                 |  2 +-
 external/mit/xf86-video-geode/dist/src/panel/panel.c           |  2 +-
 external/mit/xf86-video-intel-2014/dist/src/legacy/i810/i810.h |  2 +-
 external/mit/xf86-video-intel/dist/src/legacy/i810/i810.h      |  2 +-
 external/mit/xf86-video-openchrome/dist/src/via_driver.h       |  4 ++--
 external/mit/xf86-video-openchrome/dist/src/via_sii164.h       |  2 +-
 external/mit/xf86-video-openchrome/dist/src/via_vt1632.h       |  2 +-
 external/mit/xorg-server.old/dist/hw/xfree86/common/compiler.h |  2 +-
 external/mit/xorg-server/dist/hw/xfree86/common/compiler.h     |  2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

diffs (194 lines):

diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h
--- a/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h Mon May 31 21:44:19 2021 +0000
@@ -289,7 +289,7 @@
                         uint64_t *ust, uint32_t *result_seq);
 
 
-miPointerSpriteFuncRec drmmode_sprite_funcs;
+extern miPointerSpriteFuncRec drmmode_sprite_funcs;
 
 
 #endif
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h
--- a/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h        Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h        Mon May 31 21:44:19 2021 +0000
@@ -262,7 +262,7 @@
                         uint64_t *ust, uint32_t *result_seq);
 
 
-miPointerSpriteFuncRec drmmode_sprite_funcs;
+extern miPointerSpriteFuncRec drmmode_sprite_funcs;
 
 
 #endif
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-chips/dist/util/AsmMacros.h
--- a/external/mit/xf86-video-chips/dist/util/AsmMacros.h       Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-chips/dist/util/AsmMacros.h       Mon May 31 21:44:19 2021 +0000
@@ -129,7 +129,7 @@
 }
 #else
 #ifdef __arm32__
-unsigned int IOPortBase;  /* Memory mapped I/O port area */
+extern unsigned int IOPortBase;  /* Memory mapped I/O port area */
 
 static __inline__ void
 outb(port, val)
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-geode/dist/src/geode.h
--- a/external/mit/xf86-video-geode/dist/src/geode.h    Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-geode/dist/src/geode.h    Mon May 31 21:44:19 2021 +0000
@@ -343,7 +343,7 @@
 
 /* option flags are self-explanatory */
 #ifdef HAVE_LX
-enum {
+enum LX_GeodeOpts {
     LX_OPTION_SW_CURSOR,
     LX_OPTION_HW_CURSOR,
     LX_OPTION_NOCOMPRESSION,
@@ -357,11 +357,11 @@
     LX_OPTION_FBSIZE,
     LX_OPTION_PANEL_MODE,
     LX_OPTION_DONT_PROGRAM
-} LX_GeodeOpts;
+};
 #endif
 
 #ifdef HAVE_GX
-enum {
+typedef enum {
     GX_OPTION_SW_CURSOR,
     GX_OPTION_HW_CURSOR,
     GX_OPTION_NOCOMPRESSION,
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-geode/dist/src/gx_video.c
--- a/external/mit/xf86-video-geode/dist/src/gx_video.c Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-geode/dist/src/gx_video.c Mon May 31 21:44:19 2021 +0000
@@ -114,7 +114,7 @@
 
 extern void GXAccelSync(ScrnInfoPtr pScrni);
 
-int DeltaX, DeltaY;
+extern int DeltaX, DeltaY;
 
 unsigned long graphics_lut[256];
 static int lutflag = 0;
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-geode/dist/src/lx_driver.c
--- a/external/mit/xf86-video-geode/dist/src/lx_driver.c        Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-geode/dist/src/lx_driver.c        Mon May 31 21:44:19 2021 +0000
@@ -76,7 +76,7 @@
 
 extern OptionInfoRec LX_GeodeOptions[];
 
-unsigned char *XpressROMPtr;
+extern unsigned char *XpressROMPtr;
 
 static Bool
 LXSaveScreen(ScreenPtr pScrn, int mode)
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-geode/dist/src/panel.c
--- a/external/mit/xf86-video-geode/dist/src/panel.c    Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-geode/dist/src/panel.c    Mon May 31 21:44:19 2021 +0000
@@ -53,7 +53,7 @@
 #define PLATFORM_DORADO                        1       /* Dorado + 9211 RevC           */
 #define PLATFORM_GX2BASED              1       /* Redcloud                             */
 
-unsigned char *XpressROMPtr;
+extern unsigned char *XpressROMPtr;
 
 #include "pnl_init.c"
 #include "pnl_bios.c"
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-geode/dist/src/panel/panel.c
--- a/external/mit/xf86-video-geode/dist/src/panel/panel.c      Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-geode/dist/src/panel/panel.c      Mon May 31 21:44:19 2021 +0000
@@ -65,7 +65,7 @@
 #define PLATFORM_DORADO                        1       /* Dorado + 9211 RevC */
 #define PLATFORM_REDCLOUD              1       /* GX2 */
 
-unsigned char *XpressROMPtr;
+extern unsigned char *XpressROMPtr;
 
 #include "pnl_init.c"
 #include "pnl_bios.c"
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-intel-2014/dist/src/legacy/i810/i810.h
--- a/external/mit/xf86-video-intel-2014/dist/src/legacy/i810/i810.h    Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-intel-2014/dist/src/legacy/i810/i810.h    Mon May 31 21:44:19 2021 +0000
@@ -323,6 +323,6 @@
 extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid);
 
 extern const int I810CopyROP[16];
-const int I810PatternROP[16];
+extern const int I810PatternROP[16];
 
 #endif /* _I810_H_ */
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-intel/dist/src/legacy/i810/i810.h
--- a/external/mit/xf86-video-intel/dist/src/legacy/i810/i810.h Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-intel/dist/src/legacy/i810/i810.h Mon May 31 21:44:19 2021 +0000
@@ -322,6 +322,6 @@
 extern const OptionInfoRec *I810AvailableOptions(int chipid, int busid);
 
 extern const int I810CopyROP[16];
-const int I810PatternROP[16];
+extern const int I810PatternROP[16];
 
 #endif /* _I810_H_ */
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-openchrome/dist/src/via_driver.h
--- a/external/mit/xf86-video-openchrome/dist/src/via_driver.h  Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-openchrome/dist/src/via_driver.h  Mon May 31 21:44:19 2021 +0000
@@ -394,8 +394,8 @@
 
 
 /* In via_display.c. */
-const xf86CrtcFuncsRec iga1_crtc_funcs;
-const xf86CrtcFuncsRec iga2_crtc_funcs;
+extern const xf86CrtcFuncsRec iga1_crtc_funcs;
+extern const xf86CrtcFuncsRec iga2_crtc_funcs;
 
 /* In via_exa.c. */
 Bool viaInitExa(ScreenPtr pScreen);
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-openchrome/dist/src/via_sii164.h
--- a/external/mit/xf86-video-openchrome/dist/src/via_sii164.h  Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-openchrome/dist/src/via_sii164.h  Mon May 31 21:44:19 2021 +0000
@@ -47,7 +47,7 @@
 } viaSiI164Rec, *viaSiI164RecPtr;
 
 
-const xf86OutputFuncsRec via_sii164_funcs;
+extern const xf86OutputFuncsRec via_sii164_funcs;
 
 Bool viaSiI164Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
 
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xf86-video-openchrome/dist/src/via_vt1632.h
--- a/external/mit/xf86-video-openchrome/dist/src/via_vt1632.h  Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xf86-video-openchrome/dist/src/via_vt1632.h  Mon May 31 21:44:19 2021 +0000
@@ -44,7 +44,7 @@
 } viaVT1632Rec, *viaVT1632RecPtr;
 
 
-const xf86OutputFuncsRec via_vt1632_funcs;
+extern const xf86OutputFuncsRec via_vt1632_funcs;
 
 Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
 
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xorg-server.old/dist/hw/xfree86/common/compiler.h
--- a/external/mit/xorg-server.old/dist/hw/xfree86/common/compiler.h    Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xorg-server.old/dist/hw/xfree86/common/compiler.h    Mon May 31 21:44:19 2021 +0000
@@ -714,7 +714,7 @@
 #     define PORT_SIZE short
 #    endif
 
-_X_EXPORT unsigned int IOPortBase;  /* Memory mapped I/O port area */
+extern unsigned int IOPortBase;  /* Memory mapped I/O port area */
 
 static __inline__ void
 outb(unsigned PORT_SIZE port, unsigned char val)
diff -r c5398bbde6ed -r eea8b8bf563b external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
--- a/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h        Sun May 30 01:53:30 2021 +0000
+++ b/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h        Mon May 31 21:44:19 2021 +0000
@@ -525,7 +525,7 @@
 #define PORT_SIZE short
 #endif
 
-_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
+extern unsigned int IOPortBase;      /* Memory mapped I/O port area */
 
 static __inline__ void
 outb(unsigned PORT_SIZE port, unsigned char val)