summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-02-20 15:53:26 +0000
committerGerald Carter <jerry@samba.org>2004-02-20 15:53:26 +0000
commitdb1e6c1bdb56fecd43d47324e32830e355641eae (patch)
tree9fb421a85f5368954b54093fabc2d3ea9ebe1cea /source3/include
parentbe533b6915f32934f9e8d34f299846f42038dd1d (diff)
downloadsamba-db1e6c1bdb56fecd43d47324e32830e355641eae.tar.gz
samba-db1e6c1bdb56fecd43d47324e32830e355641eae.tar.bz2
samba-db1e6c1bdb56fecd43d47324e32830e355641eae.zip
<attr/xattr.h> & <sys/xattr.h> are mutually exclusive it seems; fix build on SuSE 8.2
(This used to be commit bf271b96cf6bc42c8a23309d890febf003e1627f)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 5b0e6cd7d2..db060907e4 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -437,11 +437,10 @@
#include <sys/attributes.h>
#endif
+/* mutually exclusive (SuSE 8.2) */
#if HAVE_ATTR_XATTR_H
#include <attr/xattr.h>
-#endif
-
-#if HAVE_SYS_XATTR_H
+#elif HAVE_SYS_XATTR_H
#include <sys/xattr.h>
#endif