src/test-nextquota: fix build failure with glibc 2.24

glibc 2.24 defines Q_GETNEXTQUOTA but not `struct nextdqblk`. We
need to define it ourselves, but let's give it a hacky name that
won't cause another build error when the definition is added to
glibc.

Signed-off-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/src/test-nextquota.c b/src/test-nextquota.c
index 3baa296e1f5fceb27c297548f9e0b7c3278227d4..ba4de271f7d2a422c7c0c09755cd6a7760db4227 100644 (file)
--- a/src/test-nextquota.c
+++ b/src/test-nextquota.c
@@ -40,8 +40,10 @@
 
 #ifndef Q_GETNEXTQUOTA
 #define Q_GETNEXTQUOTA 0x800009        /* get disk limits and usage >= ID */
+#endif
 
-struct nextdqblk
+/* glibc 2.24 defines Q_GETNEXTQUOTA but not struct nextdqblk. */
+struct test_nextdqblk
   {
     u_int64_t dqb_bhardlimit;  /* absolute limit on disk quota blocks alloc */
     u_int64_t dqb_bsoftlimit;  /* preferred limit on disk quota blocks */
@@ -54,7 +56,6 @@ struct nextdqblk
     u_int32_t dqb_valid;       /* bitmask of QIF_* constants */
     u_int32_t dqb_id;          /* id for this quota info*/
   };
-#endif
 
 #ifndef Q_XGETNEXTQUOTA
 #define Q_XGETNEXTQUOTA XQM_CMD(9)
@@ -75,7 +76,7 @@ int main(int argc, char *argv[])
        uint id = 0, idflag = 0;
        char *device = NULL;
        char *tmp;
-       struct nextdqblk dqb;
+       struct test_nextdqblk dqb;
        struct fs_disk_quota xqb;
 
        while ((c = getopt(argc,argv,"ugpi:d:v")) != EOF) {
@@ -131,7 +132,7 @@ int main(int argc, char *argv[])
        if (verbose)
                printf("asking for quota type %d for id %u on %s\n", type, id, device);
 
-       memset(&dqb, 0, sizeof(struct nextdqblk));
+       memset(&dqb, 0, sizeof(struct test_nextdqblk));
        memset(&xqb, 0, sizeof(struct fs_disk_quota));
 
        if (verbose)