Bug 571440 - Android build fails on new quota check from bug 520098 (nsLocalFileUnix.cpp), r=bsmedberg

configure.in

@@ -3302,7 +3302,7 @@ AC_CHECK_HEADERS(sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h)
 
 dnl Quota support
 AC_CHECK_HEADERS(sys/quota.h)
-AC_CHECK_HEADERS(sys/sysmacros.h)
+AC_CHECK_HEADERS(linux/quota.h)
 
 dnl Try for MMX support
 dnl NB - later gcc versions require -mmmx for this header to be successfully

xpcom/io/nsLocalFileUnix.cpp

@@ -67,10 +67,8 @@
     #include <fabdef.h>
 #endif
 
-#if defined(HAVE_SYS_QUOTA_H)
-#if defined(HAVE_SYS_SYSMACROS_H)
-#include <sys/sysmacros.h>
-#endif
+#if defined(HAVE_SYS_QUOTA_H) && defined(HAVE_LINUX_QUOTA_H)
+#define USE_LINUX_QUOTACTL
 #include <sys/quota.h>
 #endif
 
@@ -1233,7 +1231,7 @@ nsLocalFile::GetDiskSpaceAvailable(PRInt64 *aDiskSpaceAvailable)
      */
     *aDiskSpaceAvailable = (PRInt64)fs_buf.f_bsize * (fs_buf.f_bavail - 1);
 
-#if defined(HAVE_SYS_STAT_H) || defined(HAVE_SYS_SYSMACROS_H)
+#if defined(USE_LINUX_QUOTACTL)
 
     if(!FillStatCache()) {
         // Return available size from statfs