[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  a33b603 libreplace: include sys/file.h only when available
      from  4829da5 s3-docs Add documentation for 'client use spnego principal'

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit a33b6032beb45f7ba07432899236fccb133a6dfc
Author: Björn Jacke <bj at sernet.de>
Date:   Sun May 30 21:52:39 2010 +0200

    libreplace: include sys/file.h only when available
    
    thanks to Joachim Schmitz <schmitz at hp.com>. This fixes #7460.

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/system/config.m4 |    2 +-
 lib/replace/system/filesys.h |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4
index 39c2f58..b8568a5 100644
--- a/lib/replace/system/config.m4
+++ b/lib/replace/system/config.m4
@@ -1,7 +1,7 @@
 # filesys
 AC_HEADER_DIRENT 
 AC_CHECK_HEADERS(fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h)
-AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
+AC_CHECK_HEADERS(sys/acl.h acl/libacl.h sys/file.h)
 
 # select
 AC_CHECK_HEADERS(sys/select.h)
diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h
index 22e3d23..6cf2dd2 100644
--- a/lib/replace/system/filesys.h
+++ b/lib/replace/system/filesys.h
@@ -77,7 +77,9 @@
 #include <sys/filio.h>
 #endif
 
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
+#endif
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>


-- 
Samba Shared Repository