Do guard includes for getmntinfo and mntent separately, should help building on Debian/kFreeBSD and fix 55526, but could need more work.

This commit is contained in:
Riccardo Mottola 2019-01-21 23:23:16 +01:00
parent ae93c9e3c9
commit 682aa3ccdc
2 changed files with 17 additions and 9 deletions

View file

@ -1,3 +1,8 @@
2019-01-21 Riccardo Mottola <rm@gnu.org>
* Source/NSWorkspace.m
Do guard includes for getmntinfo and mntent separately, should help building on Debian/kFreeBSD and fix 55526, but could need more work.
2019-01-06 Ivan Vucica <ivan@vucica.net>
* ANNOUNCE

View file

@ -34,19 +34,22 @@
#include <unistd.h>
#include <sys/types.h>
#if defined(HAVE_GETMNTINFO)
#if defined(HAVE_GETMNTINFO)
#include <sys/param.h>
#include <sys/mount.h>
#elif defined(HAVE_GETMNTENT) && defined (MNT_MEMB)
#if defined(HAVE_MNTENT_H)
#include <mntent.h>
#elif defined(HAVE_SYS_MNTENT_H)
#include <sys/mntent.h>
#else
#undef HAVE_GETMNTENT
#endif
#endif
#if defined(HAVE_GETMNTENT) && defined (MNT_MEMB)
#if defined(HAVE_MNTENT_H)
#include <mntent.h>
#elif defined(HAVE_SYS_MNTENT_H)
#include <sys/mntent.h>
#else
#undef HAVE_GETMNTENT
#endif
#endif /* HAVE_GETMNTENT */
#if defined (HAVE_SYS_STATVFS_H)
#include <sys/statvfs.h>
#endif