merge from gcc

[deliverable/binutils-gdb.git] / include / ansidecl.h

diff --git a/include/ansidecl.h b/include/ansidecl.h
index 02bb41240cbe667ecef364d99291c9cb521e0e95..380e7b35114cbbfa08a9bdcd9357f30c2b91a1a9 100644 (file)
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -258,11 +258,11 @@ So instead we use the macro below and test it against specific values.  */
 
 /* Attributes on labels were valid as of gcc 2.93. */
 #ifndef ATTRIBUTE_UNUSED_LABEL
-# if (GCC_VERSION >= 2093)
+# if (!defined (__cplusplus) && GCC_VERSION >= 2093)
 #  define ATTRIBUTE_UNUSED_LABEL ATTRIBUTE_UNUSED
 # else
 #  define ATTRIBUTE_UNUSED_LABEL
-# endif /* GNUC >= 2.93 */
+# endif /* !__cplusplus && GNUC >= 2.93 */
 #endif /* ATTRIBUTE_UNUSED_LABEL */
 
 #ifndef ATTRIBUTE_UNUSED