From 5dd5507265e3b7fecd775a106a20762a5e828421 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Mon, 16 Nov 2020 19:33:35 +0000 Subject: [PATCH] C-family : Fix a C++ ODR violation [PR97854]. The changes in r11-4799 introduced a dummy enum rid type with a different initial member name to the actual version (an ODR violation). Fixed by including the header declaring the actual type. gcc/c-family/ChangeLog: PR objc/97854 * stub-objc.c: Include c-common.h to declare enum rid. (cherry picked from commit 814e016318646d06b1662219cc716d502b76d8ce) --- gcc/c-family/stub-objc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c index 2f5355787897..f9fe66abb991 100644 --- a/gcc/c-family/stub-objc.c +++ b/gcc/c-family/stub-objc.c @@ -25,10 +25,7 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "vec.h" -/* Provide a dummy type for the RID enum used as an argument to - objc_prop_attr_kind_for_rid () */ -enum rid { DUMMY }; - +#include "c-common.h" /* for enum rid. */ #include "c-objc.h" tree -- 2.47.2