summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-02-20 15:50:18 +0000
committerGerald Carter <jerry@samba.org>2004-02-20 15:50:18 +0000
commit11bf15746901fe665f166aa148c6de7ca79ed20e (patch)
treec7ca7b17084614ef019fe10a2a6c73b505c9f36e /source3/include
parent1bfc09c51ce4f89f7855f38bd724b26cfbc8f8c7 (diff)
downloadsamba-11bf15746901fe665f166aa148c6de7ca79ed20e.tar.gz
samba-11bf15746901fe665f166aa148c6de7ca79ed20e.tar.bz2
samba-11bf15746901fe665f166aa148c6de7ca79ed20e.zip
<attr/xattr.h> & <sys/xattr.h> are mutually exclusive it seems; fix build on SuSE 8.2
(This used to be commit 34e6c5f8f3829e9ff6dd3f1377170fb150bfcec1)
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 65eebedc6c..72f14f5061 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