attr module compile failure

[Mikael Magnusson <mikachu@gmail.com>]

I recently upgraded libcap to 2.24 from 2.22 and this inexplicable
error started happening,

In file included from /usr/include/sys/capability.h:30:0,
                 from ../../Src/zsh_system.h:514,
                 from ../../Src/zsh.mdh:17,
                 from attr.mdh:17,
                 from attr.c:30:
/usr/include/sys/xattr.h:31:3: error: expected identifier before
numeric constant
   XATTR_CREATE = 1, /* set value, fail if attr already exists.  */
   ^
make[3]: *** [attr..o] Error 1

Fortunately, this random code permutation makes the error go away.

diff --git i/Src/Modules/attr.c w/Src/Modules/attr.c
index 78c1104..f4bd049 100644
--- i/Src/Modules/attr.c
+++ w/Src/Modules/attr.c
@@ -27,12 +27,12 @@
  *
  */

-#include "attr.mdh"
-#include "attr.pro"
-
 #include <sys/types.h>
 #include <sys/xattr.h>

+#include "attr.mdh"
+#include "attr.pro"
+
 static ssize_t
 xgetxattr(const char *path, const char *name, void *value, size_t
size, int symlink)
 {


If anyone has any educated guesses about what's going on here, I'm interested.

-- 
Mikael Magnusson