2008-01-30 15:12:35

by Roel Kluin

Subject: [PATCH][scripts/{genksyms/parse.c,kconfig/zconf.tab)_shipped] duplicate YYSTYPE_IS_TRIVIAL =>1st *_DECLARED

Untested patch, please confirm it's the right fix.
--
duplicate YYSTYPE_IS_TRIVIAL, 2nd should be YYSTYPE_IS_DECLARED

Signed-off-by: Roel Kluin <[email protected]>
---
diff --git a/scripts/genksyms/parse.c_shipped b/scripts/genksyms/parse.c_shipped
index 3e6079f..61f7539 100644
--- a/scripts/genksyms/parse.c_shipped
+++ b/scripts/genksyms/parse.c_shipped
@@ -377,7 +377,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */

#if (! defined yyoverflow \
&& (! defined __cplusplus \
- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+ || (defined YYSTYPE_IS_DECLARED && YYSTYPE_IS_TRIVIAL)))

/* A type that is properly aligned for any stack member. */
union yyalloc
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index d22d924..9a7bcc7 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -389,7 +389,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */

#if (! defined yyoverflow \
&& (! defined __cplusplus \
- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+ || (defined YYSTYPE_IS_DECLARED && YYSTYPE_IS_TRIVIAL)))

/* A type that is properly aligned for any stack member. */
union yyalloc

2008-01-30 16:24:41

by Sam Ravnborg

Subject: Re: [PATCH][scripts/{genksyms/parse.c,kconfig/zconf.tab)_shipped] duplicate YYSTYPE_IS_TRIVIAL =>1st *_DECLARED

On Wed, Jan 30, 2008 at 04:12:22PM +0100, Roel Kluin wrote:
> Untested patch, please confirm it's the right fix.

First off - I do not see what problem you are trying to fix.
Second - this is generated files that we never manually edit.
If the generated files are wrong the tools to generate the files
should be fixed.

Sam