From 1f720dc9a319bb66e2f5f28568614e81aa9e9e4d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 17 Aug 2021 16:06:57 -0400 Subject: [PATCH] dmx: Fix some redeclaration warnings from gcc 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Of the form: ../hw/dmx/config/xdmxconfig.c:68:26: warning: redundant redeclaration of ‘dmxConfigEntry’ [-Wredundant-decls] 68 | extern DMXConfigEntryPtr dmxConfigEntry; | ^~~~~~~~~~~~~~ --- hw/dmx/config/dmxconfig.c | 1 - hw/dmx/config/xdmxconfig.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c index 5daf9ec9c..3b9475046 100644 --- a/hw/dmx/config/dmxconfig.c +++ b/hw/dmx/config/dmxconfig.c @@ -72,7 +72,6 @@ typedef struct DMXConfigCmdStruct { DMXConfigList *xinputs; } DMXConfigCmd, *DMXConfigCmdPtr; -extern DMXConfigEntryPtr dmxConfigEntry; static DMXConfigCmd dmxConfigCmd; static int dmxDisplaysFromCommandLine; diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c index 05d839688..8cb861c74 100644 --- a/hw/dmx/config/xdmxconfig.c +++ b/hw/dmx/config/xdmxconfig.c @@ -65,7 +65,6 @@ extern FILE *yyin; #define DMX_CANVAS_WIDTH 400 #define DMX_CANVAS_HEIGHT 500 -extern DMXConfigEntryPtr dmxConfigEntry; static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual; static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay; static int dmxConfigGrabbed, dmxConfigGrabbedFine;