diff options
| author | Elliott Hughes <enh@google.com> | 2016-12-05 13:29:49 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-05-23 22:29:18 -0400 |
| commit | e2ddfccfb6f2ffd2bdd62f55de1b5f16fc936288 (patch) | |
| tree | 392604f79410db9518c4b0213ed97cff054e95f0 /util | |
| parent | db6f320912cfde97be9bf108997db1e85e323de7 (diff) | |
| download | e2fsprogs-e2ddfccfb6f2ffd2bdd62f55de1b5f16fc936288.tar.gz | |
AOSP: Fix "Can't use getmntent or getmntinfo to check for mounted filesystems!" warning.
We do have <mntent.h> and setmntent(3).
Also silence unused parameter warnings; C programmers don't care, so
upstream is unlikely to fix that.
Bug: N/A
Test: builds
Change-Id: I57db0cca68a617913e21c2ef7b6613cd1183d7c5
From AOSP commit: d5947f70714e6676bca2663af210bfb9f6118e83
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'util')
| -rw-r--r-- | util/android_config.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/util/android_config.h b/util/android_config.h index af370ff8..a1c028f6 100644 --- a/util/android_config.h +++ b/util/android_config.h @@ -1,8 +1,4 @@ -/* work around bug in AndroidConfig.h */ -#ifdef HAVE_MALLOC_H -#undef HAVE_MALLOC_H #define HAVE_MALLOC_H 1 -#endif #define ROOT_SYSCONFDIR "/etc" @@ -24,6 +20,7 @@ #define HAVE_LSEEK64_PROTOTYPE 1 #endif #define HAVE_MMAP 1 +#define HAVE_MNTENT_H 1 #define HAVE_NETINET_IN_H 1 #define HAVE_NET_IF_H 1 #define HAVE_POSIX_MEMALIGN 1 @@ -36,6 +33,7 @@ #define HAVE_PWRITE64 1 #endif #define HAVE_SETJMP_H 1 +#define HAVE_SETMNTENT 1 #define HAVE_SNPRINTF 1 #define HAVE_STDLIB_H 1 #define HAVE_STRCASECMP 1 |