X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FSystem.Reflection%2FProcessorArchitecture.cs;h=ed804f1b4818cf7ee16f933d0f6acae8e7249425;hb=54ecc9c6a18ca300ffdac495b5d3a611c80103fc;hp=7174ec0fddb86193d2e198d91f91027b2be9f2ca;hpb=a097b5471761180c4aae2dab224ed9caeeae3e86;p=mono.git diff --git a/mcs/class/corlib/System.Reflection/ProcessorArchitecture.cs b/mcs/class/corlib/System.Reflection/ProcessorArchitecture.cs index 7174ec0fddb..ed804f1b481 100644 --- a/mcs/class/corlib/System.Reflection/ProcessorArchitecture.cs +++ b/mcs/class/corlib/System.Reflection/ProcessorArchitecture.cs @@ -1,10 +1,12 @@ // // System.Reflection.ProcessorArchitecture flag // -// Author: +// Authors: // Zoltan Varga (vargaz@gmail.com) +// Marek Safar // // Copyright (C) 2005 Novell, Inc (http://www.novell.com) +// Copyright (C) 2012 Xamarin Inc (http://www.xamarin.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -26,8 +28,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if NET_2_0 - using System.Runtime.InteropServices; namespace System.Reflection { @@ -39,8 +39,10 @@ namespace System.Reflection { MSIL = 1, X86 = 2, IA64 = 3, - Amd64 = 4 + Amd64 = 4, +#if NET_4_5 + Arm = 5 +#endif } } -#endif