* UnixFile.cs: Cope with changes in UnixStream.

	* UnixStream.cs: Change FileDescriptor property to Handle for consistency.
	* StdioFileStream.cs: Change FileStream property to Handle for consistency.

svn path=/trunk/mcs/; revision=40011

4 files changed, 21 insertions, 15 deletions

diff --git a/mcs/class/Mono.Posix/Mono.Unix/ChangeLog b/mcs/class/Mono.Posix/Mono.Unix/ChangeLog
index edf07c4e27c..ca9a623865c 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/ChangeLog
+++ b/mcs/class/Mono.Posix/Mono.Unix/ChangeLog
@@ -1,5 +1,11 @@
 2005-02-02  Jonathan Pryor <jonpryor@vt.edu>
 
+	* UnixFile.cs: Cope with changes in UnixStream.
+	* UnixStream.cs: Change FileDescriptor property to Handle for consistency.
+	* StdioFileStream.cs: Change FileStream property to Handle for consistency.
+
+2005-02-02  Jonathan Pryor <jonpryor@vt.edu>
+
 	* Syscall.cs: Remove public sys_ methods.  Some were public by mistake, and
 	  others so that users could manually marshal strings if desired.  Manually
 	  marshaling strings shouldn't be necessary, though, so remove them too.
diff --git a/mcs/class/Mono.Posix/Mono.Unix/StdioFileStream.cs b/mcs/class/Mono.Posix/Mono.Unix/StdioFileStream.cs
index 790e4d770e9..0831552077d 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/StdioFileStream.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/StdioFileStream.cs
@@ -70,7 +70,7 @@ namespace Mono.Unix {
 				throw new ObjectDisposedException ("Invalid File Stream");
 		}
 
-		public IntPtr FileStream {
+		public IntPtr Handle {
 			get {return file;}
 		}
 
diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixFile.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixFile.cs
index 0b1fdee4cf4..cfe960adb93 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixFile.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixFile.cs
@@ -280,12 +280,12 @@ namespace Mono.Unix {
 
 		public static void AdviseNormalAccess (UnixStream stream, long offset, long len)
 		{
-			AdviseNormalAccess (stream.FileDescriptor, offset, len);
+			AdviseNormalAccess (stream.Handle, offset, len);
 		}
 
 		public static void AdviseNormalAccess (UnixStream stream)
 		{
-			AdviseNormalAccess (stream.FileDescriptor);
+			AdviseNormalAccess (stream.Handle);
 		}
 
 		public static void AdviseSequentialAccess (int fd, long offset, long len)
@@ -312,12 +312,12 @@ namespace Mono.Unix {
 
 		public static void AdviseSequentialAccess (UnixStream stream, long offset, long len)
 		{
-			AdviseSequentialAccess (stream.FileDescriptor, offset, len);
+			AdviseSequentialAccess (stream.Handle, offset, len);
 		}
 
 		public static void AdviseSequentialAccess (UnixStream stream)
 		{
-			AdviseSequentialAccess (stream.FileDescriptor);
+			AdviseSequentialAccess (stream.Handle);
 		}
 
 		public static void AdviseRandomAccess (int fd, long offset, long len)
@@ -344,12 +344,12 @@ namespace Mono.Unix {
 
 		public static void AdviseRandomAccess (UnixStream stream, long offset, long len)
 		{
-			AdviseRandomAccess (stream.FileDescriptor, offset, len);
+			AdviseRandomAccess (stream.Handle, offset, len);
 		}
 
 		public static void AdviseRandomAccess (UnixStream stream)
 		{
-			AdviseRandomAccess (stream.FileDescriptor);
+			AdviseRandomAccess (stream.Handle);
 		}
 
 		public static void AdviseNeedAccess (int fd, long offset, long len)
@@ -376,12 +376,12 @@ namespace Mono.Unix {
 
 		public static void AdviseNeedAccess (UnixStream stream, long offset, long len)
 		{
-			AdviseNeedAccess (stream.FileDescriptor, offset, len);
+			AdviseNeedAccess (stream.Handle, offset, len);
 		}
 
 		public static void AdviseNeedAccess (UnixStream stream)
 		{
-			AdviseNeedAccess (stream.FileDescriptor);
+			AdviseNeedAccess (stream.Handle);
 		}
 
 		public static void AdviseNoAccess (int fd, long offset, long len)
@@ -408,12 +408,12 @@ namespace Mono.Unix {
 
 		public static void AdviseNoAccess (UnixStream stream, long offset, long len)
 		{
-			AdviseNoAccess (stream.FileDescriptor, offset, len);
+			AdviseNoAccess (stream.Handle, offset, len);
 		}
 
 		public static void AdviseNoAccess (UnixStream stream)
 		{
-			AdviseNoAccess (stream.FileDescriptor);
+			AdviseNoAccess (stream.Handle);
 		}
 
 		public static void AdviseOnceAccess (int fd, long offset, long len)
@@ -440,12 +440,12 @@ namespace Mono.Unix {
 
 		public static void AdviseOnceAccess (UnixStream stream, long offset, long len)
 		{
-			AdviseOnceAccess (stream.FileDescriptor, offset, len);
+			AdviseOnceAccess (stream.Handle, offset, len);
 		}
 
 		public static void AdviseOnceAccess (UnixStream stream)
 		{
-			AdviseOnceAccess (stream.FileDescriptor);
+			AdviseOnceAccess (stream.Handle);
 		}
 	}
 }
diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixStream.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixStream.cs
index eabec2bbdfc..db480288041 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixStream.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixStream.cs
@@ -71,7 +71,7 @@ namespace Mono.Unix {
 				throw new ObjectDisposedException ("Invalid File Descriptor");
 		}
 
-		public int FileDescriptor {
+		public int Handle {
 			get {return fileDescriptor;}
 		}
 
@@ -322,7 +322,7 @@ namespace Mono.Unix {
 
 		public void SendTo (UnixStream output, ulong count)
 		{
-			SendTo (output.FileDescriptor, count);
+			SendTo (output.Handle, count);
 		}
 
 		public void SendTo (int out_fd, ulong count)