diff options
| author | Bruno Haible <bruno@clisp.org> | 2019-01-26 22:49:57 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2019-01-26 22:49:57 +0100 |
| commit | 248cb6a2499ffa5a9e652d05e61c4a959fbae605 (patch) | |
| tree | f5bf954143c3fd1a6a20b957acc16ba6ca580c12 /lib | |
| parent | 90efd9e935a293831af979a46f37dcb2876ebddf (diff) | |
| download | gnulib-248cb6a2499ffa5a9e652d05e61c4a959fbae605.tar.gz | |
mountlist: Port better to Android.
* lib/mountlist.c (MOUNTED): Redefine on Android.
* m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Redefine MOUNTED on
Android.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mountlist.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/mountlist.c b/lib/mountlist.c index 0528d8a70f..937b3bb761 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -66,7 +66,12 @@ also (obsolete) 4.3BSD, SunOS */ # include <mntent.h> # include <sys/types.h> -# if !defined MOUNTED +# if defined __ANDROID__ /* Android */ + /* Bionic versions from between 2014-01-09 and 2015-01-08 define MOUNTED to + an incorrect value; older Bionic versions don't define it at all. */ +# undef MOUNTED +# define MOUNTED "/proc/mounts" +# elif !defined MOUNTED # if defined _PATH_MOUNTED /* GNU libc */ # define MOUNTED _PATH_MOUNTED # endif |