summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-06-05 10:10:17 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-06 10:18:38 +0200
commitf78cc3aca737bf85ad9322f3a3c649b92e6833ee (patch)
tree5e866e28de858fe66d1d7bd1d2a95c23119616c0
parent44482ad452cb2b912df8d1748e64653b1bf6bfae (diff)
downloadsamba-f78cc3aca737bf85ad9322f3a3c649b92e6833ee.tar.gz
samba-f78cc3aca737bf85ad9322f3a3c649b92e6833ee.tar.bz2
samba-f78cc3aca737bf85ad9322f3a3c649b92e6833ee.zip
s3:includes: move union unid_t to vfs.h
metze
-rw-r--r--source3/include/smb.h5
-rw-r--r--source3/include/vfs.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 57795bd568..959a7c6825 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -112,11 +112,6 @@
#define OPENX_FILE_CREATE_IF_NOT_EXIST 0x10
#define OPENX_FILE_FAIL_IF_NOT_EXIST 0
-typedef union unid_t {
- uid_t uid;
- gid_t gid;
-} unid_t;
-
/* pipe string names */
#ifndef MAXSUBAUTHS
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 92f6ecd29d..09d38f3706 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -162,6 +162,11 @@ struct blocking_lock_record;
struct smb_filename;
struct dfs_GetDFSReferral;
+typedef union unid_t {
+ uid_t uid;
+ gid_t gid;
+} unid_t;
+
#define VFS_FIND(__fn__) while (handle->fns->__fn__##_fn==NULL) { \
handle = handle->next; \
}