Include all lxcmntent.h function declarations on Bionic

Newer versions of Android (5.0+, aka API Level 21+) include mntent.h, which declares setmntent and endmntent. This hits an edge case with the preprocessor checks in lxcmntent.h because HAVE_SETMNTENT and HAVE_ENDMNTENT are both defined (in Bionic's mntent.h), but conf.c always includes lxcmntent.h on Bionic! As a result, we get compiler warnings of implicit function declarations for setmntent endmntent. This patch always includes setmntent/endmntent/hasmntopt function declarations on Bionic, which gets rid of these warnings. Signed-off-by: Preetam D'Souza <preetamjdsouza@gmail.com>

Include all lxcmntent.h function declarations on Bionic
155543d9 · Preetam D'Souza · Stéphane Graber · 9179d21a · 155543d9
Commit 155543d9 authored Jun 27, 2016 by Preetam D'Souza Committed by Stéphane Graber Jun 28, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

lxcmntent.h src/include/lxcmntent.h +3 -3

No files found.
--- a/src/include/lxcmntent.h
+++ b/src/include/lxcmntent.h
@@ -36,15 +36,15 @@ extern struct mntent *getmntent (FILE *stream);
 extern struct mntent *getmntent_r (FILE *stream, struct mntent *mp, char *buffer, int bufsiz);
 #endif
-#ifndef HAVE_SETMNTENT
+#if !defined(HAVE_SETMNTENT) || IS_BIONIC
 FILE *setmntent (const char *file, const char *mode);
 #endif
-#ifndef HAVE_ENDMNTENT
+#if !defined(HAVE_ENDMNTENT) || IS_BIONIC
 int endmntent (FILE *stream);
 #endif
-#ifndef HAVE_HASMNTOPT
+#if !defined(HAVE_HASMNTOPT) || IS_BIONIC
 extern char *hasmntopt (const struct mntent *mnt, const char *opt);
 #endif