Print this page
make: unifdef for TEAMWARE_MAKE_CMN (defined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/implicit.cc
          +++ new/usr/src/cmd/make/bin/implicit.cc
↓ open down ↓ 1150 lines elided ↑ open up ↑
1151 1151                  if ((left == NULL) || (right == NULL)) {
1152 1152                          line->body.line.percent = NULL;
1153 1153                  } else {
1154 1154                          line->body.line.percent = GETNAME(left + 1, right - left - 1);
1155 1155                  }
1156 1156          } else {
1157 1157                  line->body.line.percent = NULL;
1158 1158          }
1159 1159          pat_rule->being_expanded = false;
1160 1160  
1161      -#ifdef TEAMWARE_MAKE_CMN
1162      -        /*
1163      -         * This #ifdef fixes a dmake bug, but introduces bugid 1136156.
1164      -         */
1165 1161          return result;
1166      -#else
1167      -        return build_ok;
1168      -#endif
1169 1162  }
1170 1163  
1171 1164  /*
1172 1165   *      match_found_with_pattern 
1173 1166   *           ( target, pat_rule, percent, percent_buf)
1174 1167   *      
1175 1168   *      matches "target->string" with a % pattern.
1176 1169   *      If pattern contains a MACRO definition, it's expanded first.
1177 1170   *
1178 1171   *      Return value:
↓ open down ↓ 292 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX