rpms/flex/devel flex-2.5.33-yy.patch,1.1,1.2 flex.spec,1.39,1.40
Petr Machata (pmachata)
fedora-extras-commits at redhat.com
Fri Jun 22 11:18:34 UTC 2007
- Previous message (by thread): rpms/xterm/devel xterm-226-man-page_paths.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 xterm.spec, 1.56, 1.57 xterm-222-man-page_paths.patch, 1.2, NONE
- Next message (by thread): rpms/libpqxx/devel libpqxx.spec,1.16,1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pmachata
Update of /cvs/pkgs/rpms/flex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24692
Modified Files:
flex-2.5.33-yy.patch flex.spec
Log Message:
- Don't emit yy-prefixed variables in C++ mode. Thanks Srinivas Aji.
- Related: #242742
- Related: #244259
flex-2.5.33-yy.patch:
Index: flex-2.5.33-yy.patch
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex-2.5.33-yy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- flex-2.5.33-yy.patch 30 Mar 2007 12:18:50 -0000 1.1
+++ flex-2.5.33-yy.patch 22 Jun 2007 11:18:29 -0000 1.2
@@ -1,12 +1,13 @@
diff -urp flex-2.5.33/flex.skl flex-2.5.33-pm/flex.skl
--- flex-2.5.33/flex.skl 2006-02-16 23:20:43.000000000 +0100
+++ flex-2.5.33-pm/flex.skl 2007-03-30 14:04:42.000000000 +0200
-@@ -54,6 +54,32 @@ m4_changequote([[, ]])
+@@ -54,6 +54,34 @@ m4_changequote([[, ]])
%# the generated scanner as a C-style comment. This is to aid those who
%# edit the skeleton.
%#
+
+%not-for-header
++%if-c-only
+%if-not-reentrant
+m4_ifelse(M4_YY_PREFIX,yy,,
+#define yy_create_buffer M4_YY_PREFIX[[_create_buffer]]
@@ -29,6 +30,7 @@
+#define yyfree M4_YY_PREFIX[[free]]
+)
+%endif
++%endif
+%ok-for-header
+
#define FLEX_SCANNER
@@ -37,12 +39,13 @@
diff -urp flex-2.5.33/skel.c flex-2.5.33-pm/skel.c
--- flex-2.5.33/skel.c 2006-02-21 03:45:41.000000000 +0100
+++ flex-2.5.33-pm/skel.c 2007-03-30 14:04:43.000000000 +0200
-@@ -59,6 +59,32 @@ const char *skel[] = {
+@@ -59,6 +59,34 @@ const char *skel[] = {
"%# the generated scanner as a C-style comment. This is to aid those who",
"%# edit the skeleton.",
"%#",
+ "",
+ "%not-for-header",
++ "%if-c-only",
+ "%if-not-reentrant",
+ "m4_ifelse(M4_YY_PREFIX,yy,,",
+ "#define yy_create_buffer M4_YY_PREFIX[[_create_buffer]]",
@@ -65,6 +68,7 @@
+ "#define yyfree M4_YY_PREFIX[[free]]",
+ ")",
+ "%endif",
++ "%endif",
+ "%ok-for-header",
+ "",
"#define FLEX_SCANNER",
Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- flex.spec 11 May 2007 15:49:39 -0000 1.39
+++ flex.spec 22 Jun 2007 11:18:29 -0000 1.40
@@ -1,7 +1,7 @@
Summary: A tool for creating scanners (text pattern recognizers)
Name: flex
Version: 2.5.33
-Release: 7%{?dist}
+Release: 8%{?dist}
License: BSD
Group: Development/Tools
URL: http://flex.sourceforge.net/
@@ -80,6 +80,11 @@
%{_infodir}/flex.info*
%changelog
+* Fri Jun 22 2007 Petr Machata <pmachata at redhat.com> - 2.5.33-8
+- Don't emit yy-prefixed variables in C++ mode. Thanks Srinivas Aji.
+- Related: #242742
+- Related: #244259
+
* Fri May 11 2007 Petr Machata <pmachata at redhat.com> - 2.5.33-7
- Allow joining short options into one commandline argument.
- Resolves: #239695
- Previous message (by thread): rpms/xterm/devel xterm-226-man-page_paths.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 xterm.spec, 1.56, 1.57 xterm-222-man-page_paths.patch, 1.2, NONE
- Next message (by thread): rpms/libpqxx/devel libpqxx.spec,1.16,1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list