Print this page
make: unifdef for TEAMWARE_MAKE_CMN (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/globals.cc
          +++ new/usr/src/cmd/make/bin/globals.cc
↓ open down ↓ 48 lines elided ↑ open up ↑
  49   49   */
  50   50          FILE            *dependency_report_file;
  51   51  
  52   52  /*
  53   53   * Global variables used by make
  54   54   */
  55   55          Boolean         allrules_read=false;
  56   56          Name            posix_name;
  57   57          Name            svr4_name;
  58   58          Boolean         sdot_target;    /* used to identify s.m(/M)akefile */
  59      -        Boolean         all_parallel;                   /* TEAMWARE_MAKE_CMN */
       59 +        Boolean         all_parallel;
  60   60          Boolean         assign_done;
  61   61          int foo;        
  62   62          Boolean         build_failed_seen;
  63   63          Name            built_last_make_run;
  64   64          Name            c_at;
  65   65          Boolean         cleanup;
  66   66          Boolean         close_report;
  67   67          Boolean         command_changed;
  68   68          Boolean         commands_done;
  69   69          Chain           conditional_targets;
↓ open down ↓ 25 lines elided ↑ open up ↑
  95   95          Boolean         filter_stderr;                  /* `-X' */
  96   96  #endif
  97   97          Name            force;
  98   98          Name            ignore_name;
  99   99          Boolean         ignore_errors;                  /* `-i' */
 100  100          Boolean         ignore_errors_all;              /* `-i' */
 101  101          Name            init;
 102  102          int             job_msg_id;
 103  103          Boolean         keep_state;
 104  104          Name            make_state;
 105      -#ifdef TEAMWARE_MAKE_CMN
 106  105          timestruc_t     make_state_before;
 107      -#endif
 108  106          Dependency      makefiles_used;
 109  107          Name            makeflags;
 110  108  //      Boolean         make_state_locked; // Moved to lib/mksh
 111  109          Name            make_version;
 112  110          char            mbs_buffer2[(MAXPATHLEN * MB_LEN_MAX)];
 113  111          char            *mbs_ptr;
 114  112          char            *mbs_ptr2;
 115  113          int             mtool_msgs_fd;
 116  114          Boolean         depinfo_already_read = false;
 117  115          Boolean         no_action_was_taken = true;     /* true if we've not **
 118  116                                                          ** run any command   */
 119  117  
 120      -        Boolean         no_parallel = false;            /* TEAMWARE_MAKE_CMN */
      118 +        Boolean         no_parallel = false;
 121  119          Name            no_parallel_name;
 122  120          Name            not_auto;
 123      -        Boolean         only_parallel;                  /* TEAMWARE_MAKE_CMN */
 124      -        Boolean         parallel;                       /* TEAMWARE_MAKE_CMN */
      121 +        Boolean         only_parallel;
      122 +        Boolean         parallel;
 125  123          Name            parallel_name;
 126  124          Name            localhost_name;
 127  125          int             parallel_process_cnt;
 128  126          Percent         percent_list;
 129  127          Dyntarget       dyntarget_list;
 130  128          Name            plus;
 131  129          Name            pmake_machinesfile;
 132  130          Name            precious;
 133  131          Name            primary_makefile;
 134  132          Boolean         quest;                          /* `-q' */
↓ open down ↓ 52 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX