diff options
| author | Robert Lipe <robertl@dgii.com> | 1998-12-07 10:37:59 +0000 |
|---|---|---|
| committer | Robert Lipe <robertl@dgii.com> | 1998-12-07 10:37:59 +0000 |
| commit | 9cfb6988ef7bd014b70e1bb56f24496a5b15a055 (patch) | |
| tree | 9c4f2b603fb8eb2b88130ea1361b5fbd765bc6ff | |
| parent | a7d5941518b9add7c1ea40bb19c782128e3aecc0 (diff) | |
�
Correction of more merge mincemeat in the ffixinc-branch. I'm being
punished severely for a bad trunk merge from a couple of weeks ago. This
seems to bring a 'cvs diff -regcs_latest_snapshot' on our branch into
line.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/ffixinc-branch@24148 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/java/parse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/java/parse.c b/gcc/java/parse.c index bb1ee9403d5..abd795a1f38 100644 --- a/gcc/java/parse.c +++ b/gcc/java/parse.c @@ -2219,7 +2219,7 @@ static const short yycheck[] = { 3, #define YYPURE 1 /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/cygnus/gnupro-98r1/share/bison.simple" +#line 3 "/usr/local/share/bison.simple" /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -2412,7 +2412,7 @@ __yy_memcpy (char *to, char *from, int count) #endif #endif -#line 196 "/usr/cygnus/gnupro-98r1/share/bison.simple" +#line 196 "/usr/local/share/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -4630,7 +4630,7 @@ case 493: break;} } /* the action file gets copied in in place of this dollarsign */ -#line 498 "/usr/cygnus/gnupro-98r1/share/bison.simple" +#line 498 "/usr/local/share/bison.simple" yyvsp -= yylen; yyssp -= yylen; |