<attr/xattr.h> & <sys/xattr.h> are mutually exclusive it seems; fix build on SuSE 8.2

(This used to be commit bf271b96cf6bc42c8a23309d890febf003e1627f)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 5b0e6cd7d29a5a1f5a1aa5f0c9b99aa5ed4a7b79..db060907e4d8f81b4e225f21b44952edcf43577a 100644 (file)
--- 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