Print this page
make: unifdef for other OSes (undefined)

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/files.cc
          +++ new/usr/src/cmd/make/bin/files.cc
↓ open down ↓ 140 lines elided ↑ open up ↑
 141  141                  target->stat.mode = buf.st_mode & 0777;
 142  142                  target->stat.size = buf.st_size;
 143  143                  target->stat.is_dir =
 144  144                    BOOLEAN((buf.st_mode & S_IFMT) == S_IFDIR);
 145  145                  if (target->stat.is_dir) {
 146  146                          target->stat.time = file_is_dir;
 147  147                  } else {
 148  148                          /* target->stat.time = buf.st_mtime; */
 149  149  /* BID_1129806 */
 150  150  /* vis@nbsp.nsk.su */
 151      -#if defined(linux)
 152      -                        timestruc_t ttime = { buf.st_mtime, 0 };
 153      -                        target->stat.time = MAX(ttime, file_min_time);
 154      -#else
 155  151                          target->stat.time = MAX(buf.st_mtim, file_min_time);
 156      -#endif
 157  152                  }
 158  153          }
 159  154          if ((target->colon_splits > 0) &&
 160  155              (get_prop(target->prop, time_prop) == NULL)) {
 161  156                  append_prop(target, time_prop)->body.time.time =
 162  157                    target->stat.time;
 163  158          }
 164  159          return target->stat.time;
 165  160  }
 166  161  
↓ open down ↓ 16 lines elided ↑ open up ↑
 183  178          target->stat.mode = buf.st_mode & 0777;
 184  179          target->stat.size = buf.st_size;
 185  180          target->stat.is_dir =
 186  181            BOOLEAN((buf.st_mode & S_IFMT) == S_IFDIR);
 187  182          if (target->stat.is_dir) {
 188  183                  target->stat.time = file_is_dir;
 189  184          } else {
 190  185                  /* target->stat.time = buf.st_mtime; */
 191  186  /* BID_1129806 */
 192  187  /* vis@nbsp.nsk.su */
 193      -#if defined(linux)
 194      -                timestruc_t ttime = { buf.st_mtime, 0 };
 195      -                target->stat.time = ttime;
 196      -#else
 197  188                  target->stat.time = MAX(buf.st_mtim, file_min_time);
 198      -#endif
 199  189          }
 200  190  }
 201  191  
 202  192  
 203  193  /*
 204  194   *      vpath_exists(target)
 205  195   *
 206  196   *      Called if exists() discovers that there is a VPATH defined.
 207  197   *      This function stats the VPATH translation of the target.
 208  198   *
↓ open down ↓ 512 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX