summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoderick W. Smith <allura@localhost>2021-01-13 14:40:10 +0000
committerRoderick W. Smith <allura@localhost>2021-01-13 14:40:10 +0000
commit8fbc65a048a71c6930ef66cb7ae35f326e12cdf5 (patch)
tree8e96a0bc67621d95dc0450a8be682368dc4ac644
parent78bc9d81e2835388c7bfe0f1b576ca45ade309c2 (diff)
parentc03d1105dc6ac3b0bd253d45cec0573fa5dcef46 (diff)
downloadsgdisk-8fbc65a048a71c6930ef66cb7ae35f326e12cdf5.tar.gz
Merge /u/aaronbamberger/gptfdisk/ branch master into master
https://sourceforge.net/p/gptfdisk/code/merge-requests/23/
-rw-r--r--diskio-unix.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/diskio-unix.cc b/diskio-unix.cc
index d9f8b8d..35a4f5e 100644
--- a/diskio-unix.cc
+++ b/diskio-unix.cc
@@ -307,7 +307,7 @@ int DiskIO::DiskSync(void) {
// Note that seeking beyond the end of the file is NOT detected as a failure!
int DiskIO::Seek(uint64_t sector) {
int retval = 1;
- off_t seekTo, sought;
+ off64_t seekTo, sought;
// If disk isn't open, try to open it....
if (!isOpen) {
@@ -424,7 +424,7 @@ int DiskIO::Write(void* buffer, int numBytes) {
// return correct values for disk image files.
uint64_t DiskIO::DiskSize(int *err) {
uint64_t sectors = 0; // size in sectors
- off_t bytes = 0; // size in bytes
+ off64_t bytes = 0; // size in bytes
struct stat64 st;
int platformFound = 0;
#ifdef __sun__