fix 'multiple definition of' linker error

Fix for FTBFS due to -fno-common on GCC 10.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
This commit is contained in:
Christian Gmeiner
2020-12-03 14:22:23 +01:00
committed by Martin-Éric Racine
parent c8c1e7ffbe
commit ba63bf6821
4 changed files with 7 additions and 7 deletions

View File

@@ -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 {
enum GX_GeodeOpts {
GX_OPTION_SW_CURSOR,
GX_OPTION_HW_CURSOR,
GX_OPTION_NOCOMPRESSION,
@@ -378,7 +378,7 @@ enum {
GX_OPTION_FBSIZE,
GX_OPTION_PANEL_GEOMETRY,
GX_OPTION_DONT_PROGRAM
} GX_GeodeOpts;
};
#endif
/* geode_dcon.c */

View File

@@ -78,7 +78,7 @@
extern OptionInfoRec GX_GeodeOptions[];
unsigned char *XpressROMPtr;
extern unsigned char *XpressROMPtr;
static inline void
gx_enable_dac_power(void)

View File

@@ -112,7 +112,7 @@ void GXSetVideoPosition(int x, int y, int width, int height,
extern void GXAccelSync(ScrnInfoPtr pScrni);
int DeltaX, DeltaY;
extern int DeltaX, DeltaY;
unsigned long graphics_lut[256];
static int lutflag = 0;

View File

@@ -74,7 +74,7 @@
extern OptionInfoRec LX_GeodeOptions[];
unsigned char *XpressROMPtr;
extern unsigned char *XpressROMPtr;
static Bool
LXSaveScreen(ScreenPtr pScrn, int mode)