Print this page
make: unifdef for TEAMWARE_MAKE_CMN (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  
  49   49  
  50      -#ifdef TEAMWARE_MAKE_CMN
  51   50  #define MAXJOBS_ADJUST_RFE4694000
  52   51  
  53   52  #ifdef MAXJOBS_ADJUST_RFE4694000
  54   53  extern void job_adjust_fini();
  55   54  #endif /* MAXJOBS_ADJUST_RFE4694000 */
  56      -#endif /* TEAMWARE_MAKE_CMN */
  57   55  
  58   56  
  59   57  /*
  60   58   * Defined macros
  61   59   */
  62   60  
  63   61  /*
  64   62   * typedefs & structs
  65   63   */
  66   64  
↓ open down ↓ 84 lines elided ↑ open up ↑
 151  149                  (void) fprintf(stderr,
 152  150                                 catgets(catd, 1, 156, "Current working directory %s\n"),
 153  151                                 get_current_path());
 154  152          }
 155  153          (void) fflush(stderr);
 156  154          if (fatal_in_progress) {
 157  155                  exit_status = 1;
 158  156                  exit(1);
 159  157          }
 160  158          fatal_in_progress = true;
 161      -#ifdef TEAMWARE_MAKE_CMN
 162  159          /* Let all parallel children finish */
 163  160          if ((dmake_mode_type == parallel_mode) &&
 164  161              (parallel_process_cnt > 0)) {
 165  162                  (void) fprintf(stderr,
 166  163                                 catgets(catd, 1, 157, "Waiting for %d %s to finish\n"),
 167  164                                 parallel_process_cnt,
 168  165                                 parallel_process_cnt == 1 ?
 169  166                                 catgets(catd, 1, 158, "job") : catgets(catd, 1, 159, "jobs"));
 170  167                  (void) fflush(stderr);
 171  168          }
 172  169  
 173  170          while (parallel_process_cnt > 0) {
 174  171                  await_parallel(true);
 175  172                  finish_children(false);
 176  173          }
 177      -#endif
 178  174  
 179  175  #if defined (TEAMWARE_MAKE_CMN) && defined (MAXJOBS_ADJUST_RFE4694000)
 180  176          job_adjust_fini();
 181  177  #endif
 182  178  
 183  179          exit_status = 1;
 184  180          exit(1);
 185  181  }
 186  182  
 187  183  /*
↓ open down ↓ 761 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX