make: unifdef for SUNOS4_AND_AFTER (defined)

          --- old/usr/src/cmd/make/bin/depvar.cc
          +++ new/usr/src/cmd/make/bin/depvar.cc

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 1995 Sun Microsystems, Inc. All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   */
  25   25  
  26   26  /*
  27   27   * Included files
  28   28   */
  29   29  #include <mk/defs.h>
  30   30  #include <mksh/misc.h>          /* getmem() */
  31   31  
  32   32  /*
  33   33   * This file deals with "Dependency Variables".
  34   34   * The "-V var" command line option is used to indicate
  35   35   * that var is a dependency variable.  Used in conjunction with
  36   36   * the -P option the user is asking if the named variables affect
  37   37   * the dependencies of the given target.
  38   38   */
  39   39  
  40   40  struct _Depvar {
  41   41          Name            name;           /* Name of variable */
  42   42          struct _Depvar  *next;          /* Linked list */
  43   43          Boolean         cmdline;        /* Macro defined on the cmdline? */
  44   44  };
  45   45  
  46   46  typedef struct _Depvar  *Depvar;
  47   47  
  48   48  static  Depvar          depvar_list;
  49   49  static  Depvar          *bpatch = &depvar_list;
  50   50  static  Boolean         variant_deps;

  51   51  
  52   52  /*
  53   53   * Add a name to the list.
  54   54   */
  55   55  
  56   56  void
  57   57  depvar_add_to_list(Name name, Boolean cmdline)
  58   58  {
  59   59          Depvar          dv;
  60   60  
  61      -#ifdef SUNOS4_AND_AFTER
  62   61          dv = ALLOC(Depvar);
  63      -#else
  64      -        dv = (Depvar) Malloc(sizeof(struct _Depvar));
  65      -#endif
  66   62          dv->name = name;
  67   63          dv->next = NULL;
  68   64          dv->cmdline = cmdline;
  69   65          *bpatch = dv;
  70   66          bpatch = &dv->next;
  71   67  }
  72   68  
  73   69  /*
  74   70   * The macro `name' has been used in either the left-hand or
  75   71   * right-hand side of a dependency.  See if it is in the

  76   72   * list.  Two things are looked for.  Names given as args
  77   73   * to the -V list are checked so as to set the same/differ
  78   74   * output for the -P option.  Names given as macro=value
  79   75   * command-line args are checked and, if found, an NSE

  80   76   * warning is produced.
  81   77   */
  82   78  void
  83   79  depvar_dep_macro_used(Name name)
  84   80  {
  85   81          Depvar          dv;
  86   82  
  87   83          for (dv = depvar_list; dv != NULL; dv = dv->next) {
  88   84                  if (name == dv->name) {
  89   85  #ifdef NSE
  90      -#ifdef SUNOS4_AND_AFTER
  91   86                          if (dv->cmdline) {
  92      -#else
  93      -                        if (is_true(dv->cmdline)) {
  94      -#endif
  95   87                                  nse_dep_cmdmacro(dv->name->string);
  96   88                          }
  97   89  #endif
  98   90                          variant_deps = true;
  99   91                          break;
 100   92                  }
 101   93          }
 102   94  }
 103   95  
 104   96  #ifdef NSE

 105   97  /*
 106   98   * The macro `name' has been used in either the argument

 107   99   * to a cd before a recursive make.  See if it was
 108  100   * defined on the command-line and, if so, complain.
 109  101   */
 110  102  void
 111  103  depvar_rule_macro_used(Name name)
 112  104  {
 113  105          Depvar          dv;
 114  106  
 115  107          for (dv = depvar_list; dv != NULL; dv = dv->next) {
 116  108                  if (name == dv->name) {
 117      -#ifdef SUNOS4_AND_AFTER
 118  109                          if (dv->cmdline) {
 119      -#else
 120      -                        if (is_true(dv->cmdline)) {
 121      -#endif
 122  110                                  nse_rule_cmdmacro(dv->name->string);
 123  111                          }
 124  112                          break;
 125  113                  }
 126  114          }
 127  115  }
 128  116  #endif
 129  117  
 130  118  /*
 131  119   * Print the results.  If any of the Dependency Variables

 132  120   * affected the dependencies then the dependencies potentially
 133  121   * differ because of these variables.
 134  122   */
 135  123  void
 136  124  depvar_print_results(void)
 137  125  {
 138  126          if (variant_deps) {
 139  127                  printf(catgets(catd, 1, 234, "differ\n"));
 140  128          } else {
 141  129                  printf(catgets(catd, 1, 235, "same\n"));
 142  130          }
 143  131  }
 144  132  

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX