aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2023-01-28 14:46:50 -0800
committerTheodore Ts'o <tytso@mit.edu>2023-01-30 00:03:16 -0500
commitcb588deaaeefb63b7046f52e7563a007e7a054a6 (patch)
treeba26f9fb9433aff3a984f512d457bbf559c045d0
parent3282029c914fd010e4eada587ad819f2f85f1334 (diff)
downloade2fsprogs-cb588deaaeefb63b7046f52e7563a007e7a054a6.tar.gz
lib/ext2fs: don't warn about lack of getmntent on Windows
It is expected that Windows doesn't have getmntent(), so don't warn about it. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--lib/ext2fs/Android.bp1
-rw-r--r--lib/ext2fs/ismounted.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp
index eb4482d79..f5cbeec9f 100644
--- a/lib/ext2fs/Android.bp
+++ b/lib/ext2fs/Android.bp
@@ -121,7 +121,6 @@ cc_library {
enabled: true,
include_dirs: ["external/e2fsprogs/include/mingw"],
cflags: [
- "-Wno-error=cpp",
"-Wno-format",
"-Wno-unused-variable",
"-Wno-error=typedef-redefinition",
diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
index fe64e8bb3..8fc0b99da 100644
--- a/lib/ext2fs/ismounted.c
+++ b/lib/ext2fs/ismounted.c
@@ -408,7 +408,7 @@ errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags,
#ifdef HAVE_GETMNTINFO
retval = check_getmntinfo(device, mount_flags, mtpt, mtlen);
#else
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(_WIN32)
#warning "Can't use getmntent or getmntinfo to check for mounted filesystems!"
#endif
*mount_flags = 0;