Print this page
make: use the more modern wchar routines, not widec.h

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/implicit.cc
          +++ new/usr/src/cmd/make/bin/implicit.cc
↓ open down ↓ 1138 lines elided ↑ open up ↑
1139 1139          }
1140 1140          line->body.line.sccs_command = false;
1141 1141          line->body.line.target = true_target;
1142 1142          line->body.line.command_template = pat_rule->command_template;
1143 1143          line->body.line.star = GETNAME(percent.buffer.start, FIND_LENGTH);
1144 1144          line->body.line.less = less;
1145 1145  
1146 1146          if (lmn_target->parenleft) {
1147 1147                  Wstring lmn_string(lmn_target);
1148 1148  
1149      -                wchar_t *left = (wchar_t *) wschr(lmn_string.get_string(), (int) parenleft_char);
1150      -                wchar_t *right = (wchar_t *) wschr(lmn_string.get_string(), (int) parenright_char);
     1149 +                wchar_t *left = (wchar_t *) wcschr(lmn_string.get_string(), (int) parenleft_char);
     1150 +                wchar_t *right = (wchar_t *) wcschr(lmn_string.get_string(), (int) parenright_char);
1151 1151  
1152 1152                  if ((left == NULL) || (right == NULL)) {
1153 1153                          line->body.line.percent = NULL;
1154 1154                  } else {
1155 1155                          line->body.line.percent = GETNAME(left + 1, right - left - 1);
1156 1156                  }
1157 1157          } else {
1158 1158                  line->body.line.percent = NULL;
1159 1159          }
1160 1160          pat_rule->being_expanded = false;
↓ open down ↓ 304 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX