Hello community, here is the log from the commit of package cdecl for openSUSE:Factory checked in at 2015-06-15 17:49:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cdecl (Old) and /work/SRC/openSUSE:Factory/.cdecl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cdecl" Changes: -------- --- /work/SRC/openSUSE:Factory/cdecl/cdecl.changes 2012-02-16 12:18:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cdecl.new/cdecl.changes 2015-06-15 17:49:52.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 11 09:08:54 UTC 2015 - [email protected] + +- keyword-identifier.patch: rename identifier conflicting with keyword + +------------------------------------------------------------------- New: ---- keyword-identifier.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdecl.spec ++++++ --- /var/tmp/diff_new_pack.0cyNgJ/_old 2015-06-15 17:49:54.000000000 +0200 +++ /var/tmp/diff_new_pack.0cyNgJ/_new 2015-06-15 17:49:54.000000000 +0200 @@ -27,6 +27,7 @@ Source: %name-%version.tar.xz Patch1: %name-2.5-deb11.diff +Patch2: keyword-identifier.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison flex readline-devel xz @@ -41,7 +42,7 @@ %prep %setup -%patch -P 1 -p1 +%patch -P 1 -P 2 -p1 %build make CFLAGS="%optflags -DUSE_READLINE -DOLD_READLINE" %{?_smp_mflags}; ++++++ keyword-identifier.patch ++++++ From: [email protected] Date: Thu Jun 11 09:08:54 +0000 "restrict" is a keyword used by the programming language. Rename it. Index: cdecl-2.5/cdecl.c =================================================================== --- cdecl-2.5.orig/cdecl.c +++ cdecl-2.5/cdecl.c @@ -241,7 +241,7 @@ struct /* for unsupported combinations of types. */ void mbcheck() { - register int i, j, restrict; + register int i, j, restriction; char *t1, *t2; /* Loop through the types */ @@ -258,26 +258,26 @@ void mbcheck() if (!(modbits & crosstypes[j].bit)) continue; /* check the type of restriction */ - restrict = crosscheck[i][j]; - if (restrict == ALWAYS) + restriction = crosscheck[i][j]; + if (restriction == ALWAYS) continue; t1 = crosstypes[i].name; t2 = crosstypes[j].name; - if (restrict == NEVER) + if (restriction == NEVER) { notsupported("", t1, t2); } - else if (restrict == RITCHIE) + else if (restriction == RITCHIE) { if (RitchieFlag) notsupported(" (Ritchie Compiler)", t1, t2); } - else if (restrict == PREANSI) + else if (restriction == PREANSI) { if (PreANSIFlag || RitchieFlag) notsupported(" (Pre-ANSI Compiler)", t1, t2); } - else if (restrict == ANSI) + else if (restriction == ANSI) { if (!RitchieFlag && !PreANSIFlag) notsupported(" (ANSI Compiler)", t1, t2); @@ -286,7 +286,7 @@ void mbcheck() { (void) fprintf (stderr, "%s: Internal error in crosscheck[%d,%d]=%d!\n", - progname, i, j, restrict); + progname, i, j, restriction); exit(1); /* NOTREACHED */ } }
