diff options
| author | Eric Biggers <ebiggers@google.com> | 2023-01-04 01:03:01 -0800 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2023-01-11 03:26:12 +0000 |
| commit | babec051ea643665d0f0d46c46482841ec62e2d2 (patch) | |
| tree | f9ecb712d41b4123c54132b332fb74a33d75e397 | |
| parent | 0c82cec0d1aa70c993b5231a2c2244eb5175e638 (diff) | |
| download | e2fsprogs-babec051ea643665d0f0d46c46482841ec62e2d2.tar.gz | |
libext2fs: fix 32-bit Windows build
_WIN32 is the standard macro to detect Windows, regardless of 32-bit or
64-bit. _WIN64 is for 64-bit Windows only. Use _WIN32 where _WIN64 was
incorrectly being used.
This fixes several 32-bit Windows build errors, for example this one:
plausible.c: In function ‘print_ext2_info’:
plausible.c:109:31: error: ‘unix_io_manager’ undeclared (first use in this function); did you mean ‘undo_io_manager’?
109 | unix_io_manager,
| ^~~~~~~~~~~~~~~
| undo_io_manager
Fixes: 86b6db9f5a43 ("libext2fs: code adaptation to use the Windows IO manager")
Cc: Paulo Antonio Alvarez <pauloaalvarez@gmail.com>
Change-Id: I548b204edd1d7b30ddf9fa3a9c1020179d2cbae9
Signed-off-by: Eric Biggers <ebiggers@google.com>
| -rw-r--r-- | lib/ext2fs/getsectsize.c | 12 | ||||
| -rw-r--r-- | lib/support/plausible.c | 2 | ||||
| -rw-r--r-- | util/subst.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/ext2fs/getsectsize.c b/lib/ext2fs/getsectsize.c index 3a461eb9..bd978c53 100644 --- a/lib/ext2fs/getsectsize.c +++ b/lib/ext2fs/getsectsize.c @@ -51,10 +51,10 @@ */ errcode_t ext2fs_get_device_sectsize(const char *file, int *sectsize) { -#ifdef _WIN64 +#ifdef _WIN32 *sectsize = 512; // just guessing return 0; -#else // not _WIN64 +#else // not _WIN32 int fd; @@ -78,7 +78,7 @@ errcode_t ext2fs_get_device_sectsize(const char *file, int *sectsize) close(fd); return 0; -#endif // ifdef _WIN64 +#endif // ifdef _WIN32 } /* @@ -117,11 +117,11 @@ int ext2fs_get_dio_alignment(int fd) */ errcode_t ext2fs_get_device_phys_sectsize(const char *file, int *sectsize) { -#ifdef _WIN64 +#ifdef _WIN32 return ext2fs_get_device_sectsize(file, sectsize); -#else // not _WIN64 +#else // not _WIN32 int fd; @@ -147,5 +147,5 @@ errcode_t ext2fs_get_device_phys_sectsize(const char *file, int *sectsize) close(fd); return 0; -#endif // ifdef _WIN64 +#endif // ifdef _WIN32 } diff --git a/lib/support/plausible.c b/lib/support/plausible.c index bbed2a70..349aa2c4 100644 --- a/lib/support/plausible.c +++ b/lib/support/plausible.c @@ -103,7 +103,7 @@ static void print_ext2_info(const char *device) time_t tm; retval = ext2fs_open2(device, 0, EXT2_FLAG_64BITS, 0, 0, -#ifdef _WIN64 +#ifdef _WIN32 windows_io_manager, #else unix_io_manager, diff --git a/util/subst.c b/util/subst.c index c0eda5cf..be2a0dda 100644 --- a/util/subst.c +++ b/util/subst.c @@ -434,7 +434,7 @@ int main(int argc, char **argv) printf("Using original atime\n"); set_utimes(outfn, fileno(old), tv); } -#ifndef _WIN64 +#ifndef _WIN32 if (ofd >= 0) (void) fchmod(ofd, 0444); #endif @@ -444,7 +444,7 @@ int main(int argc, char **argv) } else { if (verbose) printf("Creating or replacing %s.\n", outfn); -#ifndef _WIN64 +#ifndef _WIN32 if (ofd >= 0) (void) fchmod(ofd, 0444); #endif |