Merge pull request #1640 from 86Box/master

Brought the branch up to par with master.
2021-09-01 15:03:15 +02:00
parent 8afee010d0 e4197b8ca4
commit a505a6a910
55 changed files with 5492 additions and 339 deletions
--- a/src/disk/mo.c
+++ b/src/disk/mo.c
@@ -361,7 +361,7 @@ mo_load(mo_t *dev, char *fn)
    }

    fseek(dev->drv->f, 0, SEEK_END);
-    size = (uint32_t) ftello64(dev->drv->f);
+    size = (uint32_t) ftell(dev->drv->f);

    if (is_mdi) {
 	/* This is a MDI image. */