summaryrefslogtreecommitdiff
path: root/source3/lib/sysquotas_xfs.c
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2012-09-07 13:13:49 +0200
committerBjoern Jacke <bj@sernet.de>2012-09-07 15:59:46 +0200
commitee2d6ae1480496c89f483cc3613f025a9342b6ab (patch)
tree347ef80539bb4458f534ed473f0f7838895415ee /source3/lib/sysquotas_xfs.c
parent3810ee4e87eda67583f4458435b28112ee711300 (diff)
downloadsamba-ee2d6ae1480496c89f483cc3613f025a9342b6ab.tar.gz
samba-ee2d6ae1480496c89f483cc3613f025a9342b6ab.tar.bz2
samba-ee2d6ae1480496c89f483cc3613f025a9342b6ab.zip
s3:quota: clean up and consolidate the xfs quota checks and defines
Autobuild-User(master): Björn Jacke <bj@sernet.de> Autobuild-Date(master): Fri Sep 7 15:59:46 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/lib/sysquotas_xfs.c')
-rw-r--r--source3/lib/sysquotas_xfs.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/source3/lib/sysquotas_xfs.c b/source3/lib/sysquotas_xfs.c
index c0df85d6c9..cf77eace97 100644
--- a/source3/lib/sysquotas_xfs.c
+++ b/source3/lib/sysquotas_xfs.c
@@ -23,18 +23,20 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_QUOTA
-#if defined(HAVE_SYS_QUOTAS) && (defined(HAVE_XFS_QUOTAS) || defined(HAVE_LINUX_XFS_QUOTAS))
+#if defined(HAVE_SYS_QUOTAS) && defined(HAVE_XFS_QUOTAS)
+
+#ifdef HAVE_SYS_QUOTA_H
+#include <sys/quota.h>
+#endif
+
+/* this one should actually come from glibc: */
+/* #include "samba_linux_quota.h" */
-#ifdef HAVE_LINUX_XFS_QUOTAS
-#include "samba_linux_quota.h"
#ifdef HAVE_XFS_XQM_H
#include <xfs/xqm.h>
#endif
#define HAVE_GROUP_QUOTA
-#else /* IRIX */
-#include <sys/quota.h>
-#endif
/* on IRIX */
#ifndef Q_XQUOTAON