diff options
| author | Michael Adam <obnox@samba.org> | 2011-11-25 16:36:40 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-11-26 00:34:54 +0100 |
| commit | 2c0abf2dcf040e6e32612e65f04ff488745612ae (patch) | |
| tree | d2c86b044dd2727e469f65e66bca49fe958d6b66 /ctdb/lib/replace/system/filesys.h | |
| parent | 5d94dff27e96e09e1f81d4811ce1e2492edff13f (diff) | |
| download | samba-2c0abf2dcf040e6e32612e65f04ff488745612ae.tar.gz samba-2c0abf2dcf040e6e32612e65f04ff488745612ae.tar.xz samba-2c0abf2dcf040e6e32612e65f04ff488745612ae.zip | |
update lib/replace to current upstream version (samba master)
(This used to be ctdb commit 17bcffab19fdbb435b4745ff90c327342bbbf0f8)
Diffstat (limited to 'ctdb/lib/replace/system/filesys.h')
| -rw-r--r-- | ctdb/lib/replace/system/filesys.h | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/ctdb/lib/replace/system/filesys.h b/ctdb/lib/replace/system/filesys.h index 4bf1f64865..e2c3c1dd72 100644 --- a/ctdb/lib/replace/system/filesys.h +++ b/ctdb/lib/replace/system/filesys.h @@ -1,16 +1,16 @@ #ifndef _system_filesys_h #define _system_filesys_h -/* +/* Unix SMB/CIFS implementation. filesystem system include wrappers Copyright (C) Andrew Tridgell 2004 - + ** NOTE! The following LGPL license applies to the replace ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -53,23 +53,23 @@ #include <acl/libacl.h> #endif -#ifdef HAVE_SYS_FS_S5PARAM_H +#ifdef HAVE_SYS_FS_S5PARAM_H #include <sys/fs/s5param.h> #endif #if defined (HAVE_SYS_FILSYS_H) && !defined (_CRAY) -#include <sys/filsys.h> +#include <sys/filsys.h> #endif #ifdef HAVE_SYS_STATFS_H # include <sys/statfs.h> #endif -#ifdef HAVE_DUSTAT_H +#ifdef HAVE_DUSTAT_H #include <sys/dustat.h> #endif -#ifdef HAVE_SYS_STATVFS_H +#ifdef HAVE_SYS_STATVFS_H #include <sys/statvfs.h> #endif @@ -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> @@ -98,6 +100,10 @@ #include <sys/ioctl.h> #endif +#ifdef HAVE_SYS_UIO_H +#include <sys/uio.h> +#endif + /* * Veritas File System. Often in addition to native. * Quotas different. @@ -123,7 +129,7 @@ #endif /* Some POSIX definitions for those without */ - + #ifndef S_IFDIR #define S_IFDIR 0x4000 #endif @@ -179,4 +185,19 @@ #define SEEK_SET 0 #endif +#ifdef _WIN32 +#define mkdir(d,m) _mkdir(d) +#endif + +#ifdef UID_WRAPPER +# ifndef UID_WRAPPER_DISABLE +# ifndef UID_WRAPPER_NOT_REPLACE +# define UID_WRAPPER_REPLACE +# endif /* UID_WRAPPER_NOT_REPLACE */ +# include "../uid_wrapper/uid_wrapper.h" +# endif /* UID_WRAPPER_DISABLE */ +#else /* UID_WRAPPER */ +# define uwrap_enabled() 0 +#endif /* UID_WRAPPER */ + #endif |