Integrate from mainperl.

p4raw-id: //depot/cfgperl@2140

diff --cc Makefile.SH
Simple merge

diff --cc proto.h
index 2bd96f0,03d7d0c..fab5250
--- 1/proto.h
--- 2/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));