diff options
author | David Seifert <soap@gentoo.org> | 2020-01-24 12:49:44 +0100 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2020-03-07 11:58:57 -0800 |
commit | 1610ef1d6b5ba99da9d1a639f3b65b2e61514a7d (patch) | |
tree | e018fae27008b6123b0b9c12aa3ff575b9e37953 /hw | |
parent | 2a185dd22ddb5b0d7d2ef5948591028766bb9530 (diff) |
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>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/dmx/config/dmxconfig.c | 2 | ||||
-rw-r--r-- | hw/dmx/config/xdmxconfig.c | 2 | ||||
-rw-r--r-- | hw/dmx/glxProxy/glxext.c | 2 | ||||
-rw-r--r-- | hw/xwayland/xwayland.c | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c index c1a9e1cf3..85bc0dbe4 100644 --- a/hw/dmx/config/dmxconfig.c +++ b/hw/dmx/config/dmxconfig.c @@ -72,7 +72,7 @@ typedef struct DMXConfigCmdStruct { DMXConfigList *xinputs; } DMXConfigCmd, *DMXConfigCmdPtr; -DMXConfigEntryPtr dmxConfigEntry; +extern DMXConfigEntryPtr dmxConfigEntry; static DMXConfigCmd dmxConfigCmd; static int dmxDisplaysFromCommandLine; diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c index 49e4b5459..05d839688 100644 --- a/hw/dmx/config/xdmxconfig.c +++ b/hw/dmx/config/xdmxconfig.c @@ -65,7 +65,7 @@ extern FILE *yyin; #define DMX_CANVAS_WIDTH 400 #define DMX_CANVAS_HEIGHT 500 -DMXConfigEntryPtr dmxConfigEntry; +extern DMXConfigEntryPtr dmxConfigEntry; static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual; static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay; static int dmxConfigGrabbed, dmxConfigGrabbedFine; diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c index 49848bbff..ca9780f99 100644 --- a/hw/dmx/glxProxy/glxext.c +++ b/hw/dmx/glxProxy/glxext.c @@ -47,8 +47,6 @@ #include "extinit.h" #include "glx_extinit.h" -int noGlxExtension; - /* ** Forward declarations. */ diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index feb1058b7..5fefa5923 100644 --- a/hw/xwayland/xwayland.c +++ b/hw/xwayland/xwayland.c @@ -40,7 +40,7 @@ #ifdef XF86VIDMODE #include <X11/extensions/xf86vmproto.h> -_X_EXPORT Bool noXFree86VidModeExtension; +extern _X_EXPORT Bool noXFree86VidModeExtension; #endif #ifdef XWL_HAS_GLAMOR |