From 614bbfbc4be1f4f47d55d3fbee9ae20f3a9955bb Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 16 Nov 2018 20:27:30 -0800 Subject: [PATCH] psppire: Fix multiple definitions of align_enum_type and two others. These were defined in both psppire-dict.c and widgets.c, which causes a problem building with -fno-common (which is desirable because it allows Address Sanitizer to work better). --- src/ui/gui/widgets.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ui/gui/widgets.c b/src/ui/gui/widgets.c index 26a5dac4fd..6ce1292490 100644 --- a/src/ui/gui/widgets.c +++ b/src/ui/gui/widgets.c @@ -171,9 +171,9 @@ enum_to_string (const GValue *src, GValue *dest) -GType align_enum_type; -GType measure_enum_type; -GType role_enum_type; +extern GType align_enum_type; +extern GType measure_enum_type; +extern GType role_enum_type; extern const GEnumValue align[]; -- 2.30.2