From: Iain Sandoe <iain@sandoe.co.uk>
Date: Mon, 16 Nov 2020 19:33:35 +0000 (+0000)
Subject: C-family : Fix a C++ ODR violation [PR97854].
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=814e016318646d06b1662219cc716d502b76d8ce;p=gcc.git

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.
---

diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c
index 26941aa2cb4..1914432678e 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