From 0e24cc19d337daac28cbdf67881d9f807f2ec4ea Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 14 Jul 2010 11:24:13 +0000 Subject: [PATCH] - Forgot that the changes in flex.skl won't propagate to skel.c - Resolves: #612465 --- flex-2.5.35-missing-prototypes.patch | 25 +++++++++++++++++++++++++ flex.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/flex-2.5.35-missing-prototypes.patch b/flex-2.5.35-missing-prototypes.patch index 3cd53e7..5cde066 100644 --- a/flex-2.5.35-missing-prototypes.patch +++ b/flex-2.5.35-missing-prototypes.patch @@ -26,3 +26,28 @@ diff -up flex-2.5.35/flex.skl\~ flex-2.5.35/flex.skl [[ Diff finished. Tue Jul 13 17:27:50 2010 +--- flex-2.5.35/skel.c~ 2010-07-14 13:15:42.000000000 +0200 ++++ flex-2.5.35/skel.c 2010-07-14 13:16:05.000000000 +0200 +@@ -1027,6 +1027,22 @@ + "void yyset_lineno M4_YY_PARAMS( int line_number M4_YY_PROTO_LAST_ARG );", + "]])", + "", ++ "m4_ifdef( [[M4_YY_REENTRANT]],", ++ "[[", ++ "m4_ifdef( [[M4_YY_NO_GET_COLUMN]],,", ++ "[[", ++ "int yyget_column M4_YY_PARAMS( M4_YY_PROTO_ONLY_ARG );", ++ "]])", ++ "]])", ++ "", ++ "m4_ifdef( [[M4_YY_REENTRANT]],", ++ "[[", ++ "m4_ifdef( [[M4_YY_NO_SET_COLUMN]],,", ++ "[[", ++ "void yyset_column M4_YY_PARAMS( int column_no M4_YY_PROTO_LAST_ARG );", ++ "]])", ++ "]])", ++ "", + "%if-bison-bridge", + "m4_ifdef( [[M4_YY_NO_GET_LVAL]],,", + "[[", diff --git a/flex.spec b/flex.spec index fd18fea..8c05a1b 100644 --- a/flex.spec +++ b/flex.spec @@ -1,7 +1,7 @@ Summary: A tool for creating scanners (text pattern recognizers) Name: flex Version: 2.5.35 -Release: 10%{?dist} +Release: 11%{?dist} License: BSD Group: Development/Tools URL: http://flex.sourceforge.net/ @@ -109,6 +109,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/*.a %changelog +* Wed Jul 14 2010 Petr Machata - 2.5.35-11 +- Forgot that the changes in flex.skl won't propagate to skel.c +- Resolves: #612465 + * Tue Jul 13 2010 Petr Machata - 2.5.35-10 - Declare yyget_column and yyset_column in reentrant mode. - Resolves: #612465