cdecl-misc.patch

   1 --- cdecl-2.5/cdecl.c.misc      Mon Jan 15 22:54:46 1996
   2 +++ cdecl-2.5/cdecl.c   Tue Nov  6 12:13:36 2001
   3 @@ -63,6 +63,7 @@
   4  #include <stdio.h>
   5  #include <ctype.h>
   6  #if __STDC__ || defined(DOS)
   7 +#include <errno.h>
   8  # include <stdlib.h>
   9  # include <stddef.h>
  10  # include <string.h>
  11 @@ -124,7 +125,6 @@
  12
  13  #if __STDC__
  14    char *ds(char *), *cat(char *, ...), *visible(int);
  15 -  int getopt(int,char **,char *);
  16    int main(int, char **);
  17    int yywrap(void);
  18    int dostdin(void);
  19 @@ -241,7 +241,7 @@
  20  /* for unsupported combinations of types. */
  21  void mbcheck()
  22  {
  23 -    register int i, j, restrict;
  24 +    register int i, j, restricted;
  25      char *t1, *t2;
  26
  27      /* Loop through the types */
  28 @@ -258,26 +258,26 @@
  29                 if (!(modbits & crosstypes[j].bit))
  30                     continue;
  31                 /* check the type of restriction */
  32 -               restrict = crosscheck[i][j];
  33 -               if (restrict == ALWAYS)
  34 +               restricted = crosscheck[i][j];
  35 +               if (restricted == ALWAYS)
  36                     continue;
  37                 t1 = crosstypes[i].name;
  38                 t2 = crosstypes[j].name;
  39 -               if (restrict == NEVER)
  40 +               if (restricted == NEVER)
  41                     {
  42                     notsupported("", t1, t2);
  43                     }
  44 -               else if (restrict == RITCHIE)
  45 +               else if (restricted == RITCHIE)
  46                     {
  47                     if (RitchieFlag)
  48                         notsupported(" (Ritchie Compiler)", t1, t2);
  49                     }
  50 -               else if (restrict == PREANSI)
  51 +               else if (restricted == PREANSI)
  52                     {
  53                     if (PreANSIFlag || RitchieFlag)
  54                         notsupported(" (Pre-ANSI Compiler)", t1, t2);
  55                     }
  56 -               else if (restrict == ANSI)
  57 +               else if (restricted == ANSI)
  58                     {
  59                     if (!RitchieFlag && !PreANSIFlag)
  60                         notsupported(" (ANSI Compiler)", t1, t2);
  61 @@ -286,7 +286,7 @@
  62                     {
  63                     (void) fprintf (stderr,
  64                         "%s: Internal error in crosscheck[%d,%d]=%d!\n",
  65 -                       progname, i, j, restrict);
  66 +                       progname, i, j, restricted);
  67                     exit(1); /* NOTREACHED */
  68                     }
  69                 }
  70 --- cdecl-2.5/Makefile.misc     Tue Jan 16 00:36:38 1996
  71 +++ cdecl-2.5/Makefile  Tue Nov  6 12:12:01 2001
  72 @@ -36,7 +36,7 @@
  73         lex cdlex.l && mv lex.yy.c cdlex.c
  74
  75  cdgram.c: cdgram.y
  76 -       yacc cdgram.y && mv y.tab.c cdgram.c
  77 +       bison -y  cdgram.y && mv y.tab.c cdgram.c
  78
  79  test:
  80         ./cdecl < testset