Move NET_4_0 define checks at the right position under the licence text

[mono.git] / mcs / class / corlib / System.Threading / Interlocked.cs

diff --git a/mcs/class/corlib/System.Threading/Interlocked.cs b/mcs/class/corlib/System.Threading/Interlocked.cs
index 522c3d51e65478a57fbee179c3188f174ce5a1cb..1ca340f7aed086487629ad88b5bf98ed1c58c8eb 100644 (file)
--- a/mcs/class/corlib/System.Threading/Interlocked.cs
+++ b/mcs/class/corlib/System.Threading/Interlocked.cs
@@ -34,75 +34,49 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-
-#if NET_2_0
 using System.Runtime.ConstrainedExecution;
-#endif
 
 namespace System.Threading
 {
-       public
-#if NET_2_0
-       static
-#else
-       sealed
-#endif
-       class Interlocked 
+       public static class Interlocked 
        {
 
-#if !NET_2_0
-               private Interlocked () {}
-#endif
-
-#if NET_2_0
                [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static int CompareExchange(ref int location1, int value, int comparand);
 
-#if NET_2_0
                [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static object CompareExchange(ref object location1, object value, object comparand);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static float CompareExchange(ref float location1, float value, float comparand);
 
-#if NET_2_0
                [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static int Decrement(ref int location);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static long Decrement(ref long location);
 
-#if NET_2_0
                [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static int Increment(ref int location);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static long Increment(ref long location);
 
-#if NET_2_0
                [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static int Exchange(ref int location1, int value);
 
-#if NET_2_0
                [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]
-#endif
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static object Exchange(ref object location1, object value);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static float Exchange(ref float location1, float value);
 
-#if NET_2_0
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static long CompareExchange(ref long location1, long value, long comparand);
 
@@ -143,10 +117,5 @@ namespace System.Threading
                [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.Success)]           
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                public extern static long Add(ref long location1, long value);
-#else
-               /* This is needed by the runtime fast path locking */
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               internal extern static IntPtr CompareExchange(ref IntPtr location1, IntPtr value, IntPtr comparand);
-#endif
        }
 }