Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/Mono.Posix/Mono.Unix.Native/NativeConvert.cs

@@ -195,6 +195,11 @@ namespace Mono.Unix.Native {
 			return FromTimeT (time);
 		}
 
+		public static DateTime ToDateTime (long time, long nanoTime)
+		{
+			return FromTimeT (time).AddMilliseconds (nanoTime / 1000);
+		}
+
 		public static long FromDateTime (DateTime time)
 		{
 			return ToTimeT (time);

mcs/class/Mono.Posix/Mono.Unix.Native/RealTimeSignum.cs

@@ -31,9 +31,7 @@ using System.Threading;
 namespace Mono.Unix.Native {
 
 	public struct RealTimeSignum
-#if NET_2_0
 		: IEquatable <RealTimeSignum>
-#endif
 	{
 		private int rt_offset;
 		private static readonly int MaxOffset = UnixSignal.GetSIGRTMAX () - UnixSignal.GetSIGRTMIN () - 1;

mcs/class/Mono.Posix/Mono.Unix.Native/Stdlib.cs

@@ -204,9 +204,7 @@ namespace Mono.Unix.Native {
 	#region Classes
 
 	public sealed class FilePosition : MarshalByRefObject, IDisposable 
-#if NET_2_0
 		, IEquatable <FilePosition>
-#endif
 	{
 
 		private static readonly int FilePositionDumpSize = 
@@ -305,26 +303,11 @@ namespace Mono.Unix.Native {
 	// Right now using this attribute gives an assert because it
 	// isn't implemented.
 	//
-#if NET_2_0 && UNMANAGED_FN_PTR_SUPPORT_FIXED
+#if UNMANAGED_FN_PTR_SUPPORT_FIXED
 	[UnmanagedFunctionPointer (CallingConvention.Cdecl)]
 #endif
 	public delegate void SignalHandler (int signal);
 
-#if !NET_2_0
-	internal sealed class SignalWrapper {
-		private IntPtr handler;
-
-		internal SignalWrapper (IntPtr handler)
-		{
-			this.handler = handler;
-		}
-
-		public void InvokeSignalHandler (int signum)
-		{
-			Stdlib.InvokeSignalHandler (signum, handler);
-		}
-	}
-#endif
 
 	internal class XPrintfFunctions
 	{
@@ -511,11 +494,7 @@ namespace Mono.Unix.Native {
 				return SIG_ERR;
 			if (handler == _SIG_IGN)
 				return SIG_IGN;
-#if NET_2_0
 			return (SignalHandler) Marshal.GetDelegateForFunctionPointer (handler, typeof(SignalHandler));
-#else
-			return new SignalHandler (new SignalWrapper (handler).InvokeSignalHandler);
-#endif
 		}
 
 		public static int SetSignalAction (Signum signal, SignalAction action)

mcs/class/Mono.Posix/Mono.Unix.Native/Syscall.cs.REMOVED.git-id

@@ -1 +1 @@
-0b8f1e6fa028cea47e904a1fbb9ce1a061dbc9c7
+c4ff89c0573826bf5b1b77b8f98053f071e0b0d8