Print this page
make: unifdef for REDIRECT_ERR (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/lib/mksh/globals.cc
          +++ new/usr/src/cmd/make/lib/mksh/globals.cc
↓ open down ↓ 106 lines elided ↑ open up ↑
 107  107  Name            shell_name;
 108  108  Boolean         svr4 = false;
 109  109  Name            target_arch;
 110  110  Name            target_mach;
 111  111  Boolean         tilde_rule;
 112  112  Name            virtual_root;
 113  113  Boolean         vpath_defined;
 114  114  Name            vpath_name;
 115  115  wchar_t         wcs_buffer[MAXPATHLEN];
 116  116  Boolean         working_on_targets;
 117      -#if defined (TEAMWARE_MAKE_CMN) && defined(REDIRECT_ERR)
      117 +#if defined (TEAMWARE_MAKE_CMN)
 118  118  Boolean         out_err_same;
 119  119  #endif
 120  120  pid_t           childPid = -1;  // This variable is used for killing child's process
 121  121                                  // Such as qrsh, running command, etc.
 122  122  
 123  123  /*
 124  124   * timestamps defined in defs.h
 125  125   */
 126  126  const timestruc_t file_no_time          = { -1, 0 };
 127  127  const timestruc_t file_doesnt_exist     = { 0, 0 };
 128  128  const timestruc_t file_is_dir           = { 1, 0 };
 129  129  const timestruc_t file_min_time         = { 2, 0 };
 130  130  const timestruc_t file_max_time         = { INT_MAX, 0 };
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX