sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

replace: Try to fix broken sys/capabilites.h on Linux.

Browse Source 
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
This commit is contained in:
Andreas Schneider 2011-02-02 10:40:06 +01:00 committed by Andreas Schneider
parent da3a2c68b0
commit c2207e9b2c
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/replace/system/capability.h
View File

@ -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

1
lib/replace/system/config.m4
View File

@ -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

2
lib/replace/wscript
View File

@ -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')