Print this page
make: unifdef for two bugfixes conditioned for unknown reasons (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/misc.cc
          +++ new/usr/src/cmd/make/bin/misc.cc
↓ open down ↓ 39 lines elided ↑ open up ↑
  40   40   * Included files
  41   41   */
  42   42  #include <errno.h>
  43   43  #include <mk/defs.h>
  44   44  #include <mksh/macro.h>         /* SETVAR() */
  45   45  #include <mksh/misc.h>          /* enable_interrupt() */
  46   46  #include <stdarg.h>             /* va_list, va_start(), va_end() */
  47   47  #include <vroot/report.h>       /* SUNPRO_DEPENDENCIES */
  48   48  #include <libintl.h>
  49   49  
  50      -
  51      -#define MAXJOBS_ADJUST_RFE4694000
  52      -
  53      -#ifdef MAXJOBS_ADJUST_RFE4694000
  54   50  extern void job_adjust_fini();
  55      -#endif /* MAXJOBS_ADJUST_RFE4694000 */
  56      -
  57   51  
  58   52  /*
  59   53   * Defined macros
  60   54   */
  61   55  
  62   56  /*
  63   57   * typedefs & structs
  64   58   */
  65   59  
  66   60  /*
↓ open down ↓ 99 lines elided ↑ open up ↑
 166  160                                 parallel_process_cnt == 1 ?
 167  161                                 gettext("job") : gettext("jobs"));
 168  162                  (void) fflush(stderr);
 169  163          }
 170  164  
 171  165          while (parallel_process_cnt > 0) {
 172  166                  await_parallel(true);
 173  167                  finish_children(false);
 174  168          }
 175  169  
 176      -#if defined (TEAMWARE_MAKE_CMN) && defined (MAXJOBS_ADJUST_RFE4694000)
 177  170          job_adjust_fini();
 178      -#endif
 179  171  
 180  172          exit_status = 1;
 181  173          exit(1);
 182  174  }
 183  175  
 184  176  /*
 185  177   *      warning(format, args...)
 186  178   *
 187  179   *      Print a message and continue.
 188  180   *
↓ open down ↓ 556 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX