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

mcs/class/System/System.Threading/Barrier.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // Barrier.cs
 //  
@@ -25,6 +24,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
+
 using System;
 
 namespace System.Threading

mcs/class/corlib/System.Collections.Concurrent/ConcurrentDictionary.cs

@@ -1,4 +1,4 @@
-// ConcurrentSkipList.cs
+// ConcurrentDictionary.cs
 //
 // Copyright (c) 2009 Jérémie "Garuma" Laval
 //
@@ -22,14 +22,14 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
+
 using System;
 using System.Threading;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-#if NET_4_0 || BOOTSTRAP_NET_4_0
-
 namespace System.Collections.Concurrent
 {
 	public class ConcurrentDictionary<TKey, TValue> : IDictionary<TKey, TValue>,

mcs/class/corlib/System.Collections.Concurrent/ConcurrentQueue.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // ConcurrentQueue.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,8 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
+
 using System;
 using System.Threading;
 using System.Collections;

mcs/class/corlib/System.Collections.Concurrent/ConcurrentSkipList.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // ConcurrentSkipList.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 using System.Threading;
 using System.Collections;

mcs/class/corlib/System.Collections.Concurrent/ConcurrentStack.cs

@@ -1,4 +1,3 @@
-#if NET_4_0
 // ConcurrentStack.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,8 @@
 //
 //
 
+#if NET_4_0
+
 using System;
 using System.Threading;
 using System.Collections;

mcs/class/corlib/System.Collections.Concurrent/IProducerConsumerCollection.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // IConcurrentCollection.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 using System.Collections;
 using System.Collections.Generic;

mcs/class/corlib/System.Collections.Concurrent/SplitOrderedList.cs

@@ -22,14 +22,14 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
+
 using System;
 using System.Threading;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 
-#if NET_4_0 || BOOTSTRAP_NET_4_0
-
 namespace System.Collections.Concurrent
 {
 	internal class SplitOrderedList<T>

mcs/class/corlib/System.Threading.Tasks/Future.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // Future.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 
 namespace System.Threading.Tasks

mcs/class/corlib/System.Threading.Tasks/Internal/CyclicDeque.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // CyclicDeque.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Threading;

mcs/class/corlib/System.Threading.Tasks/Internal/IScheduler.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // IScheduler.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 using System.Threading;
 using System.Collections.Generic;

mcs/class/corlib/System.Threading.Tasks/Internal/Scheduler.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // Scheduler.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 using System.Collections.Concurrent;
 

mcs/class/corlib/System.Threading.Tasks/Internal/SchedulerProxy.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // SchedulerProxy.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 
 namespace System.Threading.Tasks

mcs/class/corlib/System.Threading.Tasks/Internal/ThreadWorker.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // ThreadWorker.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 using System.Threading;
 using System.Collections.Concurrent;

mcs/class/corlib/System.Threading.Tasks/Parallel.cs

@@ -1,4 +1,3 @@
-#if NET_4_0
 // Parallel.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0
 using System;
 using System.Collections.Generic;
 using System.Collections.Concurrent;

mcs/class/corlib/System.Threading.Tasks/ParallelLoopResult.cs

@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // ParallelLoopResult.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0
 using System;
 
 namespace System.Threading.Tasks

mcs/class/corlib/System.Threading.Tasks/ParallelLoopState.cs

@@ -1,4 +1,3 @@
-#if NET_4_0
 // ParallelState.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0
 using System;
 using System.Threading;
 

mcs/class/corlib/System.Threading.Tasks/ParallelOptions.cs

@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // ParallelOptions.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0
 using System;
 using System.Threading;
 

mcs/class/corlib/System.Threading.Tasks/SimpleConcurrentBag.cs

@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // SimpleConcurrentBag.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0
 using System;
 using System.Threading;
 

mcs/class/corlib/System.Threading.Tasks/TaskCanceledException.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // TaskCanceledException.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 using System.Runtime.Serialization;
 

mcs/class/corlib/System.Threading.Tasks/TaskCompletionSource.cs

@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // TaskCompletionSource.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0
 using System;
 using System.Collections.Generic;
 

mcs/class/corlib/System.Threading.Tasks/TaskContinuationOptions.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // TaskContinuationKind.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 
 namespace System.Threading.Tasks

mcs/class/corlib/System.Threading.Tasks/TaskCreationOptions.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // TaskCreationOptions.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 
 namespace System.Threading.Tasks

mcs/class/corlib/System.Threading.Tasks/TaskFactory.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // TaskFactory.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 using System.Threading;
 

mcs/class/corlib/System.Threading.Tasks/TaskScheduler.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // TaskScheduler.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 using System.Threading;
 using System.Collections.Generic;

mcs/class/corlib/System.Threading.Tasks/TaskSchedulerException.cs

@@ -1,4 +1,3 @@
-#if NET_4_0
 // TaskSchedulerException.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0
 using System;
 using System.Runtime.Serialization;
 

mcs/class/corlib/System.Threading.Tasks/TaskStatus.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // TaskStatus.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 
 namespace System.Threading.Tasks

mcs/class/corlib/System.Threading.Tasks/UnobservedTaskExceptionEventArgs.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // UnobservedTaskExceptionEventArgs.cs
 //  
@@ -25,6 +24,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
+using System;
+
 namespace System.Threading.Tasks
 {
 	public class UnobservedTaskExceptionEventArgs : EventArgs

mcs/class/corlib/System.Threading/AtomicBoolean.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // AtomicBoolean.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 
 namespace System.Threading

mcs/class/corlib/System.Threading/CSnzi.cs

@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // CSnzi.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0
 using System;
 
 namespace System.Threading

mcs/class/corlib/System.Threading/CancellationTokenRegistration.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // CancellationTokenRegistration.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 using System.Threading;
 

mcs/class/corlib/System.Threading/CancellationTokenSource.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // CancellationTokenSource.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 using System.Collections.Generic;
 

mcs/class/corlib/System.Threading/CountdownEvent.cs

@@ -22,10 +22,10 @@
 //
 //
 
-using System;
-
 #if NET_4_0 || BOOTSTRAP_NET_4_0
 
+using System;
+
 namespace System.Threading
 {	
 	public class CountdownEvent : IDisposable

mcs/class/corlib/System.Threading/LazyInitializer.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // 
 // LazyInitializer.cs
 //  
@@ -25,6 +24,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
+
 using System;
 
 namespace System.Threading

mcs/class/corlib/System.Threading/ManualResetEventSlim.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // ManuelResetEventSlim.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,8 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
+
 using System;
 using System.Diagnostics;
 

mcs/class/corlib/System.Threading/Snzi.cs

@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // Snzi.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0
 using System;
 using System.IO;
 

mcs/class/corlib/System.Threading/SpinWait.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // SpinWait.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 
 namespace System.Threading

mcs/class/corlib/System.Threading/ThreadLocal.cs

@@ -1,4 +1,3 @@
-#if NET_4_0
 // 
 // ThreadLocal.cs
 //  
@@ -25,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if NET_4_0
 using System;
 using System.Runtime.Serialization;
 using System.Runtime.InteropServices;

mcs/class/corlib/System.Threading/Watch.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // Task.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 
 namespace System.Threading

mcs/class/corlib/System/AggregateException.cs

@@ -1,4 +1,3 @@
-#if NET_4_0 || BOOTSTRAP_NET_4_0
 // AggregateException.cs
 //
 // Copyright (c) 2008 Jérémie "Garuma" Laval
@@ -23,6 +22,7 @@
 //
 //
 
+#if NET_4_0 || BOOTSTRAP_NET_4_0
 using System;
 using System.Collections.ObjectModel;
 using System.Collections.Generic;