diff options
| author | Jb Evain <jbevain@gmail.com> | 2010-03-16 15:25:55 +0300 |
|---|---|---|
| committer | Jb Evain <jbevain@gmail.com> | 2010-03-16 15:25:55 +0300 |
| commit | f5872f06f634078397dd8c9ef7fe7900dedb915d (patch) | |
| tree | ad6d51f111be1fb533daa55d9d06a0a830b15acc /mcs/class/corlib/System.Security.Permissions | |
| parent | aaf36767771b7e46c67cf3e20ad414913b19e1ad (diff) | |
use MOONLIGHT symbol
svn path=/trunk/mcs/; revision=153671
Diffstat (limited to 'mcs/class/corlib/System.Security.Permissions')
| -rw-r--r-- | mcs/class/corlib/System.Security.Permissions/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog index a2683cb943e..86d9705e696 100644 --- a/mcs/class/corlib/System.Security.Permissions/ChangeLog +++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog @@ -1,3 +1,8 @@ +2010-03-16 Jb Evain <jbevain@novell.com> + + * PublisherIdentityPermissionAttribute.cs: use MOONLIGHT symbol to + disambiguate MonoTouch and Moonlight code. + 2009-09-22 Sebastien Pouliot <sebastien@ximian.com> * PermissionSetAttribute.cs: Don't create a pset for NET_2_1 diff --git a/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs index 2740291d494..d5ae1319b1a 100644 --- a/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if !NET_2_1 || MONOTOUCH +#if !MOONLIGHT using System.Runtime.InteropServices; using SSCX = System.Security.Cryptography.X509Certificates; |