Print this page
make: unifdef for _CHECK_UPDATE_H (undefined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/parallel.cc
          +++ new/usr/src/cmd/make/bin/parallel.cc
↓ open down ↓ 1314 lines elided ↑ open up ↑
1315 1315   *
1316 1316   *      Waits for parallel children to exit and finishes their processing.
1317 1317   *      If waitflg is false, the function returns after update_delay.
1318 1318   *
1319 1319   *      Parameters:
1320 1320   *              waitflg         dwight
1321 1321   */
1322 1322  void
1323 1323  await_parallel(Boolean waitflg)
1324 1324  {
1325      -#ifdef _CHECK_UPDATE_H
1326      -        static int number_of_unknown_children = 0;
1327      -#endif /* _CHECK_UPDATE_H */
1328 1325          Boolean         nohang;
1329 1326          pid_t           pid;
1330 1327          int             status;
1331 1328          Running         rp;
1332 1329          int             waiterr;
1333 1330  
1334 1331          nohang = false;
1335 1332          for ( ; ; ) {
1336 1333                  if (!nohang) {
1337 1334                          (void) alarm((int) update_delay);
↓ open down ↓ 15 lines elided ↑ open up ↑
1353 1350                          } else {
1354 1351                                  return;
1355 1352                          }
1356 1353                  }
1357 1354                  for (rp = running_list;
1358 1355                       (rp != NULL) && (rp->pid != pid);
1359 1356                       rp = rp->next) {
1360 1357                          ;
1361 1358                  }
1362 1359                  if (rp == NULL) {
1363      -#ifdef _CHECK_UPDATE_H
1364      -                        /* Ignore first child - it is check_update */
1365      -                        if (number_of_unknown_children <= 0) {
1366      -                                number_of_unknown_children = 1;
1367      -                                return;
1368      -                        }
1369      -#endif /* _CHECK_UPDATE_H */
1370 1360                          if (send_mtool_msgs) {
1371 1361                                  continue;
1372 1362                          } else {
1373 1363                                  fatal(catgets(catd, 1, 128, "Internal error: returned child pid not in running_list"));
1374 1364                          }
1375 1365                  } else {
1376 1366                          rp->state = (WIFEXITED(status) && WEXITSTATUS(status) == 0) ? build_ok : build_failed;
1377 1367                  }
1378 1368                  nohang = true;
1379 1369                  parallel_process_cnt--;
↓ open down ↓ 834 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX