[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Wed Feb 2 03:58:02 MST 2011
The branch, master has been updated
via c2207e9 replace: Try to fix broken sys/capabilites.h on Linux.
from da3a2c6 s4/samba-tool: Add --sync-forced flag to 'drs replicate' command
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c2207e9b2cdec9cd4c32184c668a2c469edb7148
Author: Andreas Schneider <asn at samba.org>
Date: Wed Feb 2 10:40:06 2011 +0100
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 at cryptomilk.org>
Autobuild-Date: Wed Feb 2 11:57:04 CET 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/replace/system/capability.h | 4 ++++
lib/replace/system/config.m4 | 1 +
lib/replace/wscript | 2 +-
3 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/system/capability.h b/lib/replace/system/capability.h
index a7b78f0..832bc29 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 04364bc..71d3d53 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 c6c4fe1..450e474 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')
--
Samba Shared Repository
More information about the samba-cvs
mailing list