3 files changed, 18 insertions, 26 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index ffdc1d28f3..e8f3c0bb34 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -368,14 +368,6 @@ struct stat_ex {
 typedef struct stat_ex SMB_STRUCT_STAT;
 
 /*
- * Type for DIR structure.
- */
-
-#ifndef SMB_STRUCT_DIR
-#    define SMB_STRUCT_DIR DIR
-#endif
-
-/*
  * Defines for 64 bit fcntl locks.
  */
 
diff --git a/source3/include/proto.h b/source3/include/proto.h
index f6db59e14e..303ea9ccb4 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -337,7 +337,7 @@ int sys_lstat(const char *fname,SMB_STRUCT_STAT *sbuf,
 int sys_posix_fallocate(int fd, SMB_OFF_T offset, SMB_OFF_T len);
 int sys_fallocate(int fd, enum vfs_fallocate_mode mode, SMB_OFF_T offset, SMB_OFF_T len);
 void kernel_flock(int fd, uint32 share_mode, uint32 access_mask);
-SMB_STRUCT_DIR *sys_fdopendir(int fd);
+DIR *sys_fdopendir(int fd);
 int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev);
 int sys_waitpid(pid_t pid,int *status,int options);
 char *sys_getwd(void);
@@ -487,7 +487,7 @@ uid_t nametouid(const char *name);
 gid_t nametogid(const char *name);
 void smb_panic_s3(const char *why);
 void log_stack_trace(void);
-const char *readdirname(SMB_STRUCT_DIR *p);
+const char *readdirname(DIR *p);
 bool is_in_path(const char *name, name_compare_entry *namelist, bool case_sensitive);
 void set_namearray(name_compare_entry **ppname_array, const char *namelist);
 void free_namearray(name_compare_entry *name_array);
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 023f5b177e..585214f77b 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -204,18 +204,18 @@ struct vfs_fn_pointers {
 
 	/* Directory operations */
 
-	SMB_STRUCT_DIR *(*opendir_fn)(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attributes);
-	SMB_STRUCT_DIR *(*fdopendir_fn)(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attributes);
+	DIR *(*opendir_fn)(struct vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attributes);
+	DIR *(*fdopendir_fn)(struct vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attributes);
 	struct dirent *(*readdir_fn)(struct vfs_handle_struct *handle,
-					 SMB_STRUCT_DIR *dirp,
+					 DIR *dirp,
 					 SMB_STRUCT_STAT *sbuf);
-	void (*seekdir_fn)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp, long offset);
-	long (*telldir_fn)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp);
-	void (*rewind_dir_fn)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp);
+	void (*seekdir_fn)(struct vfs_handle_struct *handle, DIR *dirp, long offset);
+	long (*telldir_fn)(struct vfs_handle_struct *handle, DIR *dirp);
+	void (*rewind_dir_fn)(struct vfs_handle_struct *handle, DIR *dirp);
 	int (*mkdir_fn)(struct vfs_handle_struct *handle, const char *path, mode_t mode);
 	int (*rmdir_fn)(struct vfs_handle_struct *handle, const char *path);
-	int (*closedir_fn)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dir);
-	void (*init_search_op_fn)(struct vfs_handle_struct *handle, SMB_STRUCT_DIR *dirp);
+	int (*closedir_fn)(struct vfs_handle_struct *handle, DIR *dir);
+	void (*init_search_op_fn)(struct vfs_handle_struct *handle, DIR *dirp);
 
 	/* File operations */
 
@@ -553,29 +553,29 @@ uint32_t smb_vfs_call_fs_capabilities(struct vfs_handle_struct *handle,
  */
 NTSTATUS smb_vfs_call_get_dfs_referrals(struct vfs_handle_struct *handle,
 					struct dfs_GetDFSReferral *r);
-SMB_STRUCT_DIR *smb_vfs_call_opendir(struct vfs_handle_struct *handle,
+DIR *smb_vfs_call_opendir(struct vfs_handle_struct *handle,
 				     const char *fname, const char *mask,
 				     uint32 attributes);
-SMB_STRUCT_DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle,
+DIR *smb_vfs_call_fdopendir(struct vfs_handle_struct *handle,
 					struct files_struct *fsp,
 					const char *mask,
 					uint32 attributes);
 struct dirent *smb_vfs_call_readdir(struct vfs_handle_struct *handle,
-					SMB_STRUCT_DIR *dirp,
+					DIR *dirp,
 					SMB_STRUCT_STAT *sbuf);
 void smb_vfs_call_seekdir(struct vfs_handle_struct *handle,
-			  SMB_STRUCT_DIR *dirp, long offset);
+			  DIR *dirp, long offset);
 long smb_vfs_call_telldir(struct vfs_handle_struct *handle,
-			  SMB_STRUCT_DIR *dirp);
+			  DIR *dirp);
 void smb_vfs_call_rewind_dir(struct vfs_handle_struct *handle,
-			     SMB_STRUCT_DIR *dirp);
+			     DIR *dirp);
 int smb_vfs_call_mkdir(struct vfs_handle_struct *handle, const char *path,
 		       mode_t mode);
 int smb_vfs_call_rmdir(struct vfs_handle_struct *handle, const char *path);
 int smb_vfs_call_closedir(struct vfs_handle_struct *handle,
-			  SMB_STRUCT_DIR *dir);
+			  DIR *dir);
 void smb_vfs_call_init_search_op(struct vfs_handle_struct *handle,
-				 SMB_STRUCT_DIR *dirp);
+				 DIR *dirp);
 int smb_vfs_call_open(struct vfs_handle_struct *handle,
 		      struct smb_filename *smb_fname, struct files_struct *fsp,
 		      int flags, mode_t mode);