From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Tue, 1 Dec 1998 11:08:16 +0000 (+0000)
Subject: Integrate from _54 mainperl modulo the NetBSD ifdef in util.c.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0fbecbbf53e77b8d40c396f3fae3f94dd3efd35d;p=p5sagit%2Fp5-mst-13.2.git

Integrate from _54 mainperl modulo the NetBSD ifdef in util.c.

p4raw-id: //depot/cfgperl@2428
---

0fbecbbf53e77b8d40c396f3fae3f94dd3efd35d
diff --cc util.c
index 58532a0,1c5ea59..3be6a91
--- a/util.c
+++ b/util.c
@@@ -15,8 -15,8 +15,7 @@@
  #include "EXTERN.h"
  #include "perl.h"
  
--/* XXX Configure test needed */
 -#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) || defined(__NetBSD__)
 +#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
  #include <signal.h>
  #endif
  
diff --cc vms/perly_c.vms
index db1f255,2fc1781..3a4ef8b
--- a/vms/perly_c.vms
+++ b/vms/perly_c.vms
@@@ -31,7 -31,7 +31,7 @@@ dep(void
  
  #line 30 "perly.y"
  #define YYERRCODE 256
--dEXT short yylhs[] = {                                        -1,
++static short yylhs[] = {                                        -1,
     45,    0,    9,    7,   10,    8,   11,   11,   11,   12,
     12,   12,   12,   24,   24,   24,   24,   24,   24,   24,
     15,   15,   15,   14,   14,   42,   42,   13,   13,   13,
@@@ -51,7 -51,7 +51,7 @@@
     34,   34,   34,    2,    2,   43,   23,   18,   19,   20,
     21,   22,   35,   35,   35,   35,
  };
--dEXT short yylen[] = {                                         2,
++static short yylen[] = {                                         2,
      0,    2,    4,    0,    4,    0,    0,    2,    2,    2,
      1,    2,    3,    1,    1,    3,    3,    3,    3,    3,
      0,    2,    6,    7,    7,    0,    2,    8,    8,   10,
@@@ -71,7 -71,7 +71,7 @@@
      0,    1,    2,    1,    1,    1,    2,    2,    2,    2,
      2,    2,    1,    1,    1,    1,
  };
--dEXT short yydefred[] = {                                      1,
++static short yydefred[] = {                                      1,
      0,    7,    0,   45,   56,   54,    0,   54,    8,   46,
      9,   11,    0,   47,   48,   49,    0,    0,    0,   63,
     64,   14,    4,  157,    0,    0,  130,    0,  152,    0,
@@@ -110,14 -110,14 +110,14 @@@
     22,    0,    0,    0,   31,    5,    0,   30,    0,    0,
     33,    0,   23,
  };
--dEXT short yydgoto[] = {                                       1,
++static short yydgoto[] = {                                       1,
      9,   66,   10,   18,   95,   17,   86,  339,   89,  328,
      3,   11,   12,   68,  344,  263,   70,   71,   72,   73,
     74,   75,   76,  269,   78,  270,  259,  261,  264,  272,
    260,  262,  113,  198,   91,   79,  238,   81,   83,  179,
    250,  142,  267,   13,    2,   14,   15,   16,   85,  256,
  };
--dEXT short yysindex[] = {                                      0,
++static short yysindex[] = {                                      0,
      0,    0,  -66,    0,    0,    0,  -48,    0,    0,    0,
      0,    0,  645,    0,    0,    0, -232, -227,  -27,    0,
      0,    0,    0,    0,  -23,  -23,    0,   -6,    0, 2099,
@@@ -156,7 -156,7 +156,7 @@@
      0, 2099, -206,  256,    0,    0,  259,    0,   92,   92,
      0, -238,    0,
  };
--dEXT short yyrindex[] = {                                      0,
++static short yyrindex[] = {                                      0,
      0,    0,  249,    0,    0,    0,    0,    0,    0,    0,
      0,    0,    0,    0,    0,    0,  184,    0,    0,    0,
      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@@ -195,7 -195,7 +195,7 @@@
      0,    0,   59,    0,    0,    0,    0,    0,    0,    0,
      0,  154,    0,
  };
--dEXT short yygindex[] = {                                      0,
++static short yygindex[] = {                                      0,
      0,    0,    0,  374,  351,    0,  -12,    0,  946,  413,
    -83,    0,    0,    0, -311,  -13, 4007, 2893,    0,    0,
      0,    0,    0,  372,   -8,    0,    0,  246, -131,   43,
@@@ -203,7 -203,7 +203,7 @@@
      0, -271,    0,    0,    0,    0,    0,    0,    0,    0,
  };
  #define YYTABLESIZE 4293
--dEXT short yytable[] = {                                      69,
++static short yytable[] = {                                      69,
    207,   62,  181,  104,  168,  102,  104,  204,  168,  248,
     20,  208,   62,  253,   58,  285,  274,  170,  298,  345,
    104,  104,  172,  202,   80,  104,  311,  148,  149,   82,
@@@ -635,7 -635,7 +635,7 @@@
      0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
      0,    0,  317,
  };
--dEXT short yycheck[] = {                                      13,
++static short yycheck[] = {                                      13,
     41,   36,   86,   41,   91,   40,   44,   59,   91,   59,
     59,   93,   36,  183,   59,   59,   41,   91,   41,  331,
     58,   59,   91,   40,  257,   63,   41,  297,  298,  257,
@@@ -1073,7 -1073,7 +1073,7 @@@
  #endif
  #define YYMAXTOKEN 314
  #if YYDEBUG
--dEXT char * yyname[] = {
++static char *yyname[] = {
  "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
  "'!'",0,0,"'$'","'%'","'&'",0,"'('","')'","'*'","'+'","','","'-'",0,0,0,0,0,0,0,
  0,0,0,0,0,"':'","';'",0,0,0,"'?'","'@'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@@ -1090,7 -1090,7 +1090,7 @@@
  "SHIFTOP","MATCHOP","UMINUS","REFGEN","POWOP","PREINC","PREDEC","POSTINC",
  "POSTDEC","ARROW",
  };
--dEXT char * yyrule[] = {
++static char *yyrule[] = {
  "$accept : prog",
  "$$1 :",
  "prog : $$1 lineseq",