Print this page
make: unifdef for REDIRECT_ERR (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/main.cc
          +++ new/usr/src/cmd/make/bin/main.cc
↓ open down ↓ 573 lines elided ↑ open up ↑
 574  574  // If we do not do that, maketool will have problems. 
 575  575  //
 576  576          if(touch) {
 577  577                  dmake_mode_type = serial_mode;
 578  578                  no_parallel = true;
 579  579          }
 580  580  #else
 581  581          parallel_flag = false;
 582  582  #endif
 583  583  
 584      -#if defined (TEAMWARE_MAKE_CMN) && defined(REDIRECT_ERR)
      584 +#if defined (TEAMWARE_MAKE_CMN)
 585  585          /*
 586  586           * Check whether stdout and stderr are physically same.
 587  587           * This is in order to decide whether we need to redirect
 588  588           * stderr separately from stdout.
 589  589           * This check is performed only if __DMAKE_SEPARATE_STDERR
 590  590           * is not set. This variable may be used in order to preserve
 591  591           * the 'old' behaviour.
 592  592           */
 593  593          out_err_same = true;
 594  594          char * dmake_sep_var = getenv(NOCATGETS("__DMAKE_SEPARATE_STDERR"));
↓ open down ↓ 2953 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX