[patch] conditionally compiles for !(linux quota version < 2)

strace-4.5.11-quota.patch (text/plain), 1.07 KB, created by Carlo Marcelo Arenas Belon on 2006-05-28 18:14:43 UTC

--- /var/tmp/strace-4.5.11/resource.c	2004-10-06 15:14:53.000000000 -0700
+++ /var/tmp/portage/strace-4.5.11/work/strace-4.5.11/resource.c	2006-05-28 18:06:39.000000000 -0700
@@ -475,11 +475,19 @@ static const struct xlat quotacmds[] = {
 	{ Q_QUOTAOFF,	"Q_QUOTAOFF"	},
 	{ Q_GETQUOTA,	"Q_GETQUOTA"	},
 	{ Q_SETQUOTA,	"Q_SETQUOTA"	},
+#ifdef Q_SETUSE
 	{ Q_SETUSE,	"Q_SETUSE"	},
+#endif
 	{ Q_SYNC,	"Q_SYNC"	},
+#ifdef Q_SETQLIM
 	{ Q_SETQLIM,	"Q_SETQLIM"	},
+#endif
+#ifdef Q_GETSTATS
 	{ Q_GETSTATS,	"Q_GETSTATS"	},
+#endif
+#ifdef Q_RSQUASH
 	{ Q_RSQUASH,	"Q_RSQUASH"	},
+#endif
 	{ NEW_CMD(0x1), "Q_SYNC"        },
 	{ NEW_CMD(0x2), "Q_QUOTAON"     },
 	{ NEW_CMD(0x3), "Q_QUOTAOFF"    },
@@ -537,7 +545,11 @@ struct tcb *tcp;
                         tprintf("{");
 			tprintf("%u, ", dq.dqb_bhardlimit);
 			tprintf("%u, ", dq.dqb_bsoftlimit);
+#if _LINUX_QUOTA_VERSION < 2
 			tprintf("%u, ", dq.dqb_curblocks);
+#else
+			tprintf("%u, ", dq.dqb_curspace);
+#endif
 			tprintf("%u, ", dq.dqb_ihardlimit);
 			tprintf("%u, ", dq.dqb_isoftlimit);
 			tprintf("%u, ", dq.dqb_curinodes);