--- sourceforge.net/trunk/rdesktop/disk.c	2004/08/25 09:48:11	758
+++ sourceforge.net/trunk/rdesktop/disk.c	2004/10/02 01:30:33	776
@@ -31,7 +31,7 @@
 #include <utime.h>
 #include <time.h>		/* ctime */
 
-#if (defined(HAVE_DIRFD) || defined(HAVE_DECL_DIRFD))
+#if (defined(HAVE_DIRFD) || (HAVE_DECL_DIRFD == 1))
 #define DIRFD(a) (dirfd(a))
 #else
 #define DIRFD(a) ((a)->DIR_FD_MEMBER_NAME)
@@ -169,9 +169,9 @@
 /* Opens or creates a file or directory */
 static NTSTATUS
 disk_create(uint32 device_id, uint32 accessmask, uint32 sharemode, uint32 create_disposition,
-	    uint32 flags_and_attributes, char *filename, HANDLE * phandle)
+	    uint32 flags_and_attributes, char *filename, NTHANDLE * phandle)
 {
-	HANDLE handle;
+	NTHANDLE handle;
 	DIR *dirp;
 	int flags, mode;
 	char path[256];
@@ -325,7 +325,7 @@
 }
 
 static NTSTATUS
-disk_close(HANDLE handle)
+disk_close(NTHANDLE handle)
 {
 	struct fileinfo *pfinfo;
 
@@ -345,7 +345,7 @@
 }
 
 static NTSTATUS
-disk_read(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
+disk_read(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
 {
 	int n;
 
@@ -382,7 +382,7 @@
 }
 
 static NTSTATUS
-disk_write(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
+disk_write(NTHANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
 {
 	int n;
 
@@ -409,7 +409,7 @@
 }
 
 NTSTATUS
-disk_query_information(HANDLE handle, uint32 info_class, STREAM out)
+disk_query_information(NTHANDLE handle, uint32 info_class, STREAM out)
 {
 	uint32 file_attributes, ft_high, ft_low;
 	struct stat filestat;
@@ -490,7 +490,7 @@
 }
 
 NTSTATUS
-disk_set_information(HANDLE handle, uint32 info_class, STREAM in, STREAM out)
+disk_set_information(NTHANDLE handle, uint32 info_class, STREAM in, STREAM out)
 {
 	uint32 device_id, length, file_attributes, ft_high, ft_low;
 	char newname[256], fullpath[256];
@@ -744,7 +744,7 @@
 
 
 NTSTATUS
-disk_query_volume_information(HANDLE handle, uint32 info_class, STREAM out)
+disk_query_volume_information(NTHANDLE handle, uint32 info_class, STREAM out)
 {
 	struct STATFS_T stat_fs;
 	struct fileinfo *pfinfo;
@@ -809,7 +809,7 @@
 }
 
 NTSTATUS
-disk_query_directory(HANDLE handle, uint32 info_class, char *pattern, STREAM out)
+disk_query_directory(NTHANDLE handle, uint32 info_class, char *pattern, STREAM out)
 {
 	uint32 file_attributes, ft_low, ft_high;
 	char *dirname, fullpath[256];
@@ -919,7 +919,7 @@
 
 
 static NTSTATUS
-disk_device_control(HANDLE handle, uint32 request, STREAM in, STREAM out)
+disk_device_control(NTHANDLE handle, uint32 request, STREAM in, STREAM out)
 {
 	uint32 result;