Fix building with `-fno-common`

* GCC 10 will switch the default to `-fno-common`.
  https://gcc.gnu.org/PR85678

Bug: https://bugs.gentoo.org/705880
Signed-off-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
David Seifert 2020-01-24 12:49:44 +01:00 committed by Matt Turner
parent 2a185dd22d
commit 1610ef1d6b
17 changed files with 17 additions and 17 deletions

View File

@ -72,7 +72,7 @@ typedef struct DMXConfigCmdStruct {
DMXConfigList *xinputs; DMXConfigList *xinputs;
} DMXConfigCmd, *DMXConfigCmdPtr; } DMXConfigCmd, *DMXConfigCmdPtr;
DMXConfigEntryPtr dmxConfigEntry; extern DMXConfigEntryPtr dmxConfigEntry;
static DMXConfigCmd dmxConfigCmd; static DMXConfigCmd dmxConfigCmd;
static int dmxDisplaysFromCommandLine; static int dmxDisplaysFromCommandLine;

View File

@ -65,7 +65,7 @@ extern FILE *yyin;
#define DMX_CANVAS_WIDTH 400 #define DMX_CANVAS_WIDTH 400
#define DMX_CANVAS_HEIGHT 500 #define DMX_CANVAS_HEIGHT 500
DMXConfigEntryPtr dmxConfigEntry; extern DMXConfigEntryPtr dmxConfigEntry;
static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual; static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual;
static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay; static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay;
static int dmxConfigGrabbed, dmxConfigGrabbedFine; static int dmxConfigGrabbed, dmxConfigGrabbedFine;

View File

@ -47,8 +47,6 @@
#include "extinit.h" #include "extinit.h"
#include "glx_extinit.h" #include "glx_extinit.h"
int noGlxExtension;
/* /*
** Forward declarations. ** Forward declarations.
*/ */

View File

@ -40,7 +40,7 @@
#ifdef XF86VIDMODE #ifdef XF86VIDMODE
#include <X11/extensions/xf86vmproto.h> #include <X11/extensions/xf86vmproto.h>
_X_EXPORT Bool noXFree86VidModeExtension; extern _X_EXPORT Bool noXFree86VidModeExtension;
#endif #endif
#ifdef XWL_HAS_GLAMOR #ifdef XWL_HAS_GLAMOR

View File

@ -33,7 +33,7 @@
#include "tests-common.h" #include "tests-common.h"
ScreenInfo screenInfo; extern ScreenInfo screenInfo;
static void static void
dix_version_compare(void) dix_version_compare(void)

View File

@ -37,7 +37,7 @@
#include "protocol-common.h" #include "protocol-common.h"
ClientRec client_window; extern ClientRec client_window;
static ClientRec client_request; static ClientRec client_request;
static void static void

View File

@ -45,6 +45,8 @@ static ClientRec server_client;
void *global_userdata; void *global_userdata;
void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
int enable_GrabButton_wrap = 1; int enable_GrabButton_wrap = 1;
int enable_XISetEventMask_wrap = 1; int enable_XISetEventMask_wrap = 1;

View File

@ -99,7 +99,7 @@ extern void *global_userdata;
* The reply handler called from WriteToClient. Set this handler if you need * The reply handler called from WriteToClient. Set this handler if you need
* to check the reply values. * to check the reply values.
*/ */
void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata); extern void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
/** /**
* The default screen used for the windows. Initialized by init_simple(). * The default screen used for the windows. Initialized by init_simple().

View File

@ -46,7 +46,7 @@ static struct {
int win; int win;
} test_data; } test_data;
ClientRec client_window; extern ClientRec client_window;
static ClientRec client_request; static ClientRec client_request;
static void static void

View File

@ -60,7 +60,7 @@ static struct {
int mask_len; int mask_len;
} test_data; } test_data;
ClientRec client_window; extern ClientRec client_window;
/* AddResource is called from XISetSEventMask, we don't need this */ /* AddResource is called from XISetSEventMask, we don't need this */
Bool Bool

View File

@ -41,7 +41,7 @@
#include "protocol-common.h" #include "protocol-common.h"
ClientRec client_window; extern ClientRec client_window;
static ClientRec client_request; static ClientRec client_request;
#define N_MODS 7 #define N_MODS 7

View File

@ -54,7 +54,7 @@ struct test_data {
int num_devices_in_reply; int num_devices_in_reply;
}; };
ClientRec client_window; extern ClientRec client_window;
static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data, static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data,
void *closure); void *closure);

View File

@ -41,7 +41,7 @@
#include "protocol-common.h" #include "protocol-common.h"
ClientRec client_window; extern ClientRec client_window;
static ClientRec client_request; static ClientRec client_request;
static void reply_XIQueryPointer_data(ClientPtr client, int len, static void reply_XIQueryPointer_data(ClientPtr client, int len,
char *data, void *closure); char *data, void *closure);

View File

@ -58,7 +58,7 @@ struct test_data {
int minor_expected; int minor_expected;
}; };
ClientRec client_window; extern ClientRec client_window;
static void static void
reply_XIQueryVersion(ClientPtr client, int len, char *data, void *closure) reply_XIQueryVersion(ClientPtr client, int len, char *data, void *closure)

View File

@ -62,7 +62,7 @@
static unsigned char *data[4096 * 20]; /* the request data buffer */ static unsigned char *data[4096 * 20]; /* the request data buffer */
ClientRec client_window; extern ClientRec client_window;
int int
__real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client, __real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,

View File

@ -48,7 +48,7 @@
#include "protocol-common.h" #include "protocol-common.h"
ClientRec client_window; extern ClientRec client_window;
static ClientRec client_request; static ClientRec client_request;
static void static void

View File

@ -44,7 +44,7 @@
static int expected_x = SPRITE_X; static int expected_x = SPRITE_X;
static int expected_y = SPRITE_Y; static int expected_y = SPRITE_Y;
ClientRec client_window; extern ClientRec client_window;
/** /**
* This function overrides the one in the screen rec. * This function overrides the one in the screen rec.