Module Name: xsrc
Committed By: joerg
Date: Mon May 31 21:44:20 UTC 2021
Modified Files:
xsrc/external/mit/xf86-video-amdgpu/dist/src: drmmode_display.h
xsrc/external/mit/xf86-video-ati-kms/dist/src: drmmode_display.h
xsrc/external/mit/xf86-video-chips/dist/util: AsmMacros.h
xsrc/external/mit/xf86-video-geode/dist/src: geode.h gx_video.c
lx_driver.c panel.c
xsrc/external/mit/xf86-video-geode/dist/src/panel: panel.c
xsrc/external/mit/xf86-video-intel-2014/dist/src/legacy/i810: i810.h
xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810: i810.h
xsrc/external/mit/xf86-video-openchrome/dist/src: via_driver.h
via_sii164.h via_vt1632.h
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common: compiler.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: compiler.h
Log Message:
Avoid multiple definitions of the same variable.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 \
xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h
cvs rdiff -u -r1.1.1.9 -r1.2 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-geode/dist/src/geode.h \
xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c \
xsrc/external/mit/xf86-video-geode/dist/src/panel.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-geode/dist/src/panel/panel.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel-2014/dist/src/legacy/i810/i810.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810.h
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_sii164.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_vt1632.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/compiler.h
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h
diff -u xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h:1.1.1.7 xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h:1.2
--- xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h:1.1.1.7 Sat Jun 1 06:38:21 2019
+++ xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h Mon May 31 21:44:19 2021
@@ -289,7 +289,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crt
uint64_t *ust, uint32_t *result_seq);
-miPointerSpriteFuncRec drmmode_sprite_funcs;
+extern miPointerSpriteFuncRec drmmode_sprite_funcs;
#endif
Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h:1.1.1.9 xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h:1.2
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h:1.1.1.9 Sat Jun 1 07:24:16 2019
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h Mon May 31 21:44:19 2021
@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crt
uint64_t *ust, uint32_t *result_seq);
-miPointerSpriteFuncRec drmmode_sprite_funcs;
+extern miPointerSpriteFuncRec drmmode_sprite_funcs;
#endif
Index: xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h
diff -u xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h:1.1.1.2 xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h:1.2
--- xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h:1.1.1.2 Wed Jun 10 00:46:36 2009
+++ xsrc/external/mit/xf86-video-chips/dist/util/AsmMacros.h Mon May 31 21:44:19 2021
@@ -129,7 +129,7 @@ unsigned long port;
}
#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)
Index: xsrc/external/mit/xf86-video-geode/dist/src/geode.h
diff -u xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.6 xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.7
--- xsrc/external/mit/xf86-video-geode/dist/src/geode.h:1.6 Tue Jan 1 00:34:52 2019
+++ xsrc/external/mit/xf86-video-geode/dist/src/geode.h Mon May 31 21:44:19 2021
@@ -343,7 +343,7 @@ typedef struct _geodeRec {
/* 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 @@ enum {
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,
Index: xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c:1.6 xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c:1.7
--- xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c:1.6 Tue Jan 1 00:34:52 2019
+++ xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c Mon May 31 21:44:19 2021
@@ -76,7 +76,7 @@
extern OptionInfoRec LX_GeodeOptions[];
-unsigned char *XpressROMPtr;
+extern unsigned char *XpressROMPtr;
static Bool
LXSaveScreen(ScreenPtr pScrn, int mode)
Index: xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c:1.2 xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c:1.3
--- xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c:1.2 Tue May 30 15:54:38 2017
+++ xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c Mon May 31 21:44:19 2021
@@ -114,7 +114,7 @@ void GXSetVideoPosition(int x, int y, in
extern void GXAccelSync(ScrnInfoPtr pScrni);
-int DeltaX, DeltaY;
+extern int DeltaX, DeltaY;
unsigned long graphics_lut[256];
static int lutflag = 0;
Index: xsrc/external/mit/xf86-video-geode/dist/src/panel.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/panel.c:1.2 xsrc/external/mit/xf86-video-geode/dist/src/panel.c:1.3
--- xsrc/external/mit/xf86-video-geode/dist/src/panel.c:1.2 Tue May 30 15:54:38 2017
+++ xsrc/external/mit/xf86-video-geode/dist/src/panel.c Mon May 31 21:44:19 2021
@@ -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"
Index: xsrc/external/mit/xf86-video-geode/dist/src/panel/panel.c
diff -u xsrc/external/mit/xf86-video-geode/dist/src/panel/panel.c:1.1.1.2 xsrc/external/mit/xf86-video-geode/dist/src/panel/panel.c:1.2
--- xsrc/external/mit/xf86-video-geode/dist/src/panel/panel.c:1.1.1.2 Thu Mar 20 06:54:20 2014
+++ xsrc/external/mit/xf86-video-geode/dist/src/panel/panel.c Mon May 31 21:44:19 2021
@@ -65,7 +65,7 @@ extern unsigned long gfx_detect_video(vo
#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"
Index: xsrc/external/mit/xf86-video-intel-2014/dist/src/legacy/i810/i810.h
diff -u xsrc/external/mit/xf86-video-intel-2014/dist/src/legacy/i810/i810.h:1.1.1.1 xsrc/external/mit/xf86-video-intel-2014/dist/src/legacy/i810/i810.h:1.2
--- xsrc/external/mit/xf86-video-intel-2014/dist/src/legacy/i810/i810.h:1.1.1.1 Fri May 10 06:22:22 2019
+++ xsrc/external/mit/xf86-video-intel-2014/dist/src/legacy/i810/i810.h Mon May 31 21:44:19 2021
@@ -323,6 +323,6 @@ extern void I810InitMC(ScreenPtr pScreen
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_ */
Index: xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810.h
diff -u xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810.h:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810.h:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810.h:1.1.1.2 Wed Mar 20 06:34:02 2019
+++ xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/i810.h Mon May 31 21:44:19 2021
@@ -322,6 +322,6 @@ extern void I810InitMC(ScreenPtr pScreen
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_ */
Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.8 xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.9
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h:1.8 Tue Aug 29 04:43:42 2017
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.h Mon May 31 21:44:19 2021
@@ -394,8 +394,8 @@ typedef struct
/* 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);
Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_sii164.h
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_sii164.h:1.1.1.1 xsrc/external/mit/xf86-video-openchrome/dist/src/via_sii164.h:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_sii164.h:1.1.1.1 Tue Aug 29 04:37:06 2017
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_sii164.h Mon May 31 21:44:19 2021
@@ -47,7 +47,7 @@ typedef struct _viaSiI164 {
} viaSiI164Rec, *viaSiI164RecPtr;
-const xf86OutputFuncsRec via_sii164_funcs;
+extern const xf86OutputFuncsRec via_sii164_funcs;
Bool viaSiI164Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
Index: xsrc/external/mit/xf86-video-openchrome/dist/src/via_vt1632.h
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_vt1632.h:1.1.1.3 xsrc/external/mit/xf86-video-openchrome/dist/src/via_vt1632.h:1.2
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_vt1632.h:1.1.1.3 Tue Aug 29 04:37:06 2017
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_vt1632.h Mon May 31 21:44:19 2021
@@ -44,7 +44,7 @@ typedef struct _viaVT1632Rec {
} viaVT1632Rec, *viaVT1632RecPtr;
-const xf86OutputFuncsRec via_vt1632_funcs;
+extern const xf86OutputFuncsRec via_vt1632_funcs;
Bool viaVT1632Init(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
Index: xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/compiler.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/compiler.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/compiler.h:1.1.1.1 Thu Jun 9 09:07:58 2016
+++ xsrc/external/mit/xorg-server.old/dist/hw/xfree86/common/compiler.h Mon May 31 21:44:20 2021
@@ -714,7 +714,7 @@ xf86WriteMmio32LeNB(__volatile__ void *b
# 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)
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.16 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.17
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h:1.16 Sun Feb 23 10:26:22 2020
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/compiler.h Mon May 31 21:44:19 2021
@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *bas
#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)
