diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-01-05 17:41:01 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-01-05 17:41:01 +1100 |
commit | 370779a1bb0218f31d02f0976e143d4b5d84b3d4 (patch) | |
tree | fd466f27d5334c23eff9dbb61c304e014e868ae9 /ctdb/lib/replace/system/capability.h | |
parent | 67d2b14d908498b28bf19febc958cbf5f91cc1ec (diff) | |
download | samba-370779a1bb0218f31d02f0976e143d4b5d84b3d4.tar.gz samba-370779a1bb0218f31d02f0976e143d4b5d84b3d4.tar.xz samba-370779a1bb0218f31d02f0976e143d4b5d84b3d4.zip |
update from Samba4
(This used to be ctdb commit 298118c41bd33acd1a34a35a71a28451a45390c5)
Diffstat (limited to 'ctdb/lib/replace/system/capability.h')
-rw-r--r-- | ctdb/lib/replace/system/capability.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/ctdb/lib/replace/system/capability.h b/ctdb/lib/replace/system/capability.h index 4fe7c8d51b..a7b78f0275 100644 --- a/ctdb/lib/replace/system/capability.h +++ b/ctdb/lib/replace/system/capability.h @@ -27,14 +27,25 @@ #ifdef HAVE_SYS_CAPABILITY_H -#if defined(BROKEN_REDHAT_7_SYSTEM_HEADERS) && !defined(_I386_STATFS_H) +#if defined(BROKEN_REDHAT_7_SYSTEM_HEADERS) && !defined(_I386_STATFS_H) && !defined(_PPC_STATFS_H) #define _I386_STATFS_H +#define _PPC_STATFS_H #define BROKEN_REDHAT_7_STATFS_WORKAROUND #endif +#if defined(BROKEN_RHEL5_SYS_CAP_HEADER) && !defined(_LINUX_TYPES_H) +#define BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND +#endif + #include <sys/capability.h> +#ifdef BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND +#undef _LINUX_TYPES_H +#undef BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND +#endif + #ifdef BROKEN_REDHAT_7_STATFS_WORKAROUND +#undef _PPC_STATFS_H #undef _I386_STATFS_H #undef BROKEN_REDHAT_7_STATFS_WORKAROUND #endif |