diff options
| author | Andreas Schneider <asn@samba.org> | 2011-02-02 10:40:06 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-02-02 11:57:04 +0100 |
| commit | c2207e9b2cdec9cd4c32184c668a2c469edb7148 (patch) | |
| tree | 0102182a361fcfe83fe715ccf636fc8ce3e12427 /lib | |
| parent | da3a2c68b0a789685f051a21579cafa71651618d (diff) | |
| download | samba-c2207e9b2cdec9cd4c32184c668a2c469edb7148.tar.gz samba-c2207e9b2cdec9cd4c32184c668a2c469edb7148.tar.bz2 samba-c2207e9b2cdec9cd4c32184c668a2c469edb7148.zip | |
replace: Try to fix broken sys/capabilites.h on Linux.
As this is more or less a broken header we need to include linux/types.h
before sys/capabilities.h to avoid redefinitions.
Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Wed Feb 2 11:57:04 CET 2011 on sn-devel-104
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/replace/system/capability.h | 4 | ||||
| -rw-r--r-- | lib/replace/system/config.m4 | 1 | ||||
| -rw-r--r-- | lib/replace/wscript | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/lib/replace/system/capability.h b/lib/replace/system/capability.h index a7b78f0275..832bc29152 100644 --- a/lib/replace/system/capability.h +++ b/lib/replace/system/capability.h @@ -37,6 +37,10 @@ #define BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND #endif +#ifdef HAVE_LINUX_TYPES_H +#include <linux/types.h> +#endif + #include <sys/capability.h> #ifdef BROKEN_RHEL5_SYS_CAP_HEADER_WORKAROUND diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4 index 04364bc3a1..71d3d53c3d 100644 --- a/lib/replace/system/config.m4 +++ b/lib/replace/system/config.m4 @@ -25,6 +25,7 @@ fi AC_HEADER_SYS_WAIT # capability +AC_CHECK_HEADERS(linux/types.h) AC_CHECK_HEADERS(sys/capability.h) case "$host_os" in diff --git a/lib/replace/wscript b/lib/replace/wscript index c6c4fe1fdf..450e474f1a 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -40,7 +40,7 @@ def configure(conf): conf.CHECK_HEADERS('crypt.h locale.h acl/libacl.h compat.h') conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') - conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('libaio.h linux/types.h locale.h ndir.h pwd.h') conf.CHECK_HEADERS('shadow.h sys/acl.h') conf.CHECK_HEADERS('sys/attributes.h sys/capability.h sys/dir.h sys/epoll.h') conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') |