diff options
| author | June McEnroe <june@causal.agency> | 2018-03-05 12:54:26 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2018-03-05 12:54:26 -0500 |
| commit | 79ab120ad31ed74a2a3221d14b7472703296a921 (patch) | |
| tree | ae575f7e84a2602b85719a35f016b087e9144a63 /merge.c | |
| parent | Pack message type enums (diff) | |
| download | torus-79ab120ad31ed74a2a3221d14b7472703296a921.tar.gz torus-79ab120ad31ed74a2a3221d14b7472703296a921.zip | |
Rename Tile timestamps {create,modify,access}Time
Diffstat (limited to 'merge.c')
| -rw-r--r-- | merge.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/merge.c b/merge.c index e59d989..7075226 100644 --- a/merge.c +++ b/merge.c @@ -87,9 +87,11 @@ int main(int argc, char *argv[]) { if (!lenA && !lenB) break; if (!lenA || !lenB) errx(EX_IOERR, "different size inputs"); - const struct Tile *tileC = (tileA.access > tileB.access) ? &tileA : &tileB; + const struct Tile *tileC = (tileA.accessTime > tileB.accessTime) + ? &tileA + : &tileB; - if (tileA.modify != tileB.modify) { + if (tileA.modifyTime != tileB.modifyTime) { drawTile(0, &tileA); drawTile(CELL_ROWS + 1, &tileB); move(CELL_ROWS * 2 + 2, 0); |