From f78cc3aca737bf85ad9322f3a3c649b92e6833ee Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 5 Jun 2012 10:10:17 +0200
Subject: [PATCH] s3:includes: move union unid_t to vfs.h

metze
---
 source3/include/smb.h | 5 -----
 source3/include/vfs.h | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 57795bd5685..959a7c68255 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 92f6ecd29d0..09d38f37062 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; \
 			 }
-- 
2.11.4.GIT