This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Integrate from mainperl.
authorJarkko Hietaniemi <jhi@iki.fi>
Fri, 30 Oct 1998 08:43:18 +0000 (08:43 +0000)
committerJarkko Hietaniemi <jhi@iki.fi>
Fri, 30 Oct 1998 08:43:18 +0000 (08:43 +0000)
p4raw-id: //depot/cfgperl@2140

1  2 
Makefile.SH
proto.h

diff --cc Makefile.SH
Simple merge
diff --cc proto.h
+++ b/proto.h
@@@ -672,9 -668,9 +668,9 @@@ VIRTUAL void       watch _((char** addr))
  VIRTUAL I32   whichsig _((char* sig));
  VIRTUAL int   yyerror _((char* s));
  #ifdef USE_PURE_BISON
 -# define PERL_YYLEX_PARAM_DECL YYSTYPE *, int *
 +# define PERL_YYLEX_PARAM_DECL YYSTYPE *lvalp, int *lcharp
  #else
- # define PERL_YYLEX_PARAM_DECL
+ # define PERL_YYLEX_PARAM_DECL void
  #endif
  VIRTUAL int   yylex _((PERL_YYLEX_PARAM_DECL));
  VIRTUAL int   yyparse _((void));