aboutsummaryrefslogtreecommitdiffstats
path: root/output.c
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-05-25 00:06:54 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-05-25 00:06:54 +0000
commit9a55a687de80f41235f0e4a74910c6528df3902a (patch)
tree869fae13c2cc18c4b6d3f4fd383e0bb9544b1fcb /output.c
parent4ecea33a988c00caa98cacf934e61e361d94e8af (diff)
downloadsrc-9a55a687de80f41235f0e4a74910c6528df3902a.tar.gz
src-9a55a687de80f41235f0e4a74910c6528df3902a.zip
Import byacc 20140422vendor/byacc/20140422
Notes
Notes: svn path=/vendor/byacc/dist/; revision=266637 svn path=/vendor/byacc/20140422/; revision=266638; tag=vendor/byacc/20140422
Diffstat (limited to 'output.c')
-rw-r--r--output.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/output.c b/output.c
index c7b7a5546e0e..eb4402d3cd5c 100644
--- a/output.c
+++ b/output.c
@@ -1,4 +1,4 @@
-/* $Id: output.c,v 1.65 2014/04/09 21:10:48 tom Exp $ */
+/* $Id: output.c,v 1.67 2014/04/22 23:16:57 tom Exp $ */
#include "defs.h"
@@ -315,9 +315,9 @@ output_accessing_symbols(void)
}
static Value_t
-find_conflict_base(Value_t cbase)
+find_conflict_base(int cbase)
{
- Value_t i, j;
+ int i, j;
for (i = 0; i < cbase; i++)
{
@@ -327,9 +327,9 @@ find_conflict_base(Value_t cbase)
break;
}
if (j + cbase >= nconflicts)
- return i;
+ break;
}
- return cbase;
+ return (Value_t) i;
}
#endif