make: unifdef for REDIRECT_ERR (defined)

          --- old/usr/src/cmd/make/lib/mksh/globals.cc
          +++ new/usr/src/cmd/make/lib/mksh/globals.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 2004 Sun Microsystems, Inc. All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   */
  25   25  
  26   26  
  27   27  /*
  28   28   *      globals.cc
  29   29   *
  30   30   *      This declares all global variables
  31   31   */
  32   32  
  33   33  /*
  34   34   * Included files
  35   35   */
  36   36  #include <mksh/globals.h>
  37   37  
  38   38  /*
  39   39   * Defined macros
  40   40   */
  41   41  
  42   42  /*
  43   43   * typedefs & structs
  44   44   */
  45   45  
  46   46  /*
  47   47   * Global variables
  48   48   */
  49   49  char            char_semantics[CHAR_SEMANTICS_ENTRIES];
  50   50  wchar_t         char_semantics_char[] = {
  51   51          ampersand_char,
  52   52          asterisk_char,
  53   53          at_char,
  54   54          backquote_char,
  55   55          backslash_char,
  56   56          bar_char,
  57   57          bracketleft_char,
  58   58          bracketright_char,
  59   59          colon_char,
  60   60          dollar_char,
  61   61          doublequote_char,
  62   62          equal_char,
  63   63          exclam_char,
  64   64          greater_char,
  65   65          hat_char,
  66   66          hyphen_char,
  67   67          less_char,
  68   68          newline_char,
  69   69          numbersign_char,
  70   70          parenleft_char,
  71   71          parenright_char,
  72   72          percent_char,
  73   73          plus_char,
  74   74          question_char,
  75   75          quote_char,
  76   76          semicolon_char,
  77   77          nul_char
  78   78  };
  79   79  Macro_list      cond_macro_list;
  80   80  Boolean         conditional_macro_used;
  81   81  Boolean         do_not_exec_rule;               /* `-n' */
  82   82  Boolean         dollarget_seen;
  83   83  Boolean         dollarless_flag;
  84   84  Name            dollarless_value;
  85   85  Envvar          envvar;
  86   86  #ifdef lint
  87   87  char            **environ;
  88   88  #endif
  89   89  int             exit_status;
  90   90  wchar_t         *file_being_read;
  91   91  /* Variable gnu_style=true if env. var. SUN_MAKE_COMPAT_MODE=GNU (RFE 4866328) */
  92   92  Boolean         gnu_style = false;
  93   93  Name_set        hashtab;
  94   94  Name            host_arch;
  95   95  Name            host_mach;
  96   96  int             line_number;
  97   97  char            *make_state_lockfile;
  98   98  Boolean         make_word_mentioned;
  99   99  Makefile_type   makefile_type = reading_nothing;
 100  100  char            mbs_buffer[(MAXPATHLEN * MB_LEN_MAX)];
 101  101  Name            path_name;
 102  102  Boolean         posix = true;
 103  103  Name            hat;
 104  104  Name            query;
 105  105  Boolean         query_mentioned;
 106  106  Boolean         reading_environment;

 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